Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +02:00
..
admin	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
application_helper.rb	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
flashes_helper.rb	Clean up flash display in views (#2336)	2017-04-23 04:22:34 +02:00
home_helper.rb	Improve initialState loading	2017-01-09 12:37:53 +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	Slightly reduce RAM usage (#7301)	2018-05-02 18:58:48 +02:00
mailer_helper.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	2018-01-04 15:36:55 +01:00
settings_helper.rb	Add Corsican localization (#7390)	2018-05-07 01:34:19 +02:00
stream_entries_helper.rb	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00