Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.		2018-09-03 14:33:06 +02:00
..
admin
settings
application_helper.rb
flashes_helper.rb	Clean up flash display in views (#2336)	2017-04-23 04:22:34 +02:00
home_helper.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	2018-03-04 20:29:49 +01:00
jsonld_helper.rb
mailer_helper.rb
routing_helper.rb
settings_helper.rb
stream_entries_helper.rb