Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		2019-03-14 17:17:20 +01:00
..
admin	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
flashes_helper.rb	Clean up flash display in views (#2336)	2017-04-23 04:22:34 +02:00
home_helper.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01: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	Fix poll update handler calling method was that was not available (#10246)	2019-03-12 22:58:59 +01:00
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	2018-01-04 15:36:55 +01:00
settings_helper.rb	I18n: Add language options for Kazakh and Lithuanian (#10104)	2019-02-23 22:20:35 +01:00
stream_entries_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00