Thibaut Girka 00fcdebed7 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.rake	Do not fetch environment variables to determine default locale (#6618)	2018-03-04 10:00:46 +01:00
auto_annotate_models.rake
db.rake
emojis.rake
glitchsoc.rake
mastodon.rake	Add tootctl settings registrations open (#8829)	2018-10-04 16:05:54 +02:00
repo.rake
statistics.rake