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
auto_annotate_models.rake
db.rake	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
emojis.rake
glitchsoc.rake
mastodon.rake	Add tootctl settings registrations open (#8829)	2018-10-04 16:05:54 +02:00
repo.rake	using mailto scheme in AUTHORS.md (#8663)	2018-09-10 02:01:03 +02:00
statistics.rake