Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml		2018-05-19 22:41:10 +02:00
..
admin	Improvements to toots display in admin view (#7452)	2018-05-12 17:44:15 +02:00
settings	…
application_helper.rb	…
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)	2018-05-12 16:48:32 +02:00
mailer_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Add Slovene language (#7475)	2018-05-14 12:52:25 +02:00
stream_entries_helper.rb	Fix double-encoding of display name in title and e-mails (#7534)	2018-05-18 15:56:57 +02:00