Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
assets	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
devise	Fix wrong string being used on login failure when using LDAP (#8534)	2018-09-01 03:35:37 +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-10-05 15:23:57 +02:00
paperclip	Unconditionally re-encode locally-uploaded images to strip metadata	2018-09-17 21:09:59 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
templates	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
cli.rb	Add tootctl settings registrations open (#8829)	2018-10-04 16:05:54 +02:00