Thibaut Girka 53b7bb9d04 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	Avoid deleted attributes when building a Status from action log (fixes #8371) (#8373)	2018-08-22 20:55:50 +02:00
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	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
instance_helper.rb
jsonld_helper.rb	Improve federated ID validation (#8372)	2018-08-22 20:55:14 +02:00
mailer_helper.rb
routing_helper.rb
settings_helper.rb	Add Georgian language translation (#8250)	2018-08-18 01:00:01 +09:00
stream_entries_helper.rb	Better singulars of account followers/toots. (#8471)	2018-08-26 21:30:53 +02:00