Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
admin
settings
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
flashes_helper.rb
home_helper.rb	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +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	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
routing_helper.rb
settings_helper.rb
stream_entries_helper.rb