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

…

settings

…

application_helper.rb

…

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

…