Thibaut Girka 4f4908311d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		2018-08-27 18:09:28 +02:00
..
admin	…
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:39:16 +02:00
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	…
mailer_helper.rb	…
routing_helper.rb	…
settings_helper.rb	…
stream_entries_helper.rb	Better singulars of account followers/toots. (#8471)	2018-08-26 21:30:53 +02:00