luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-13 02:12:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
History
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
2018-08-17 17:43:54 +02:00
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
devise Add ldap search filter (#8151) 2018-08-15 18:12:44 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
paperclip Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream 2018-07-30 14:39:06 +02:00
tasks Add some feedback to maintenance rake tasks (#8173) 2018-08-13 18:17:20 +02:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00