Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
admin	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
accounts_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-13 18:13:43 +02:00
domain_control_helper.rb	Fix whitelist federation for subdomains (#12435)	2019-11-21 11:35:39 +01:00
flashes_helper.rb	Clean up flash display in views (#2336)	2017-04-23 04:22:34 +02:00
home_helper.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
instance_helper.rb	Change OpenGraph description on sign-up page to reflect invite (#11744)	2019-09-03 04:56:54 +02:00
jsonld_helper.rb	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	2019-07-28 13:48:43 +02:00
routing_helper.rb	Fix ruby 2.7 warnings about keyword parameters (#12824)	2020-01-11 21:38:02 +01:00
settings_helper.rb	Add is to available locales (#12882)	2020-01-18 23:22:35 +01:00
statuses_helper.rb	Remove some duplicate methods from StatusHelper and reflect changes to AccountHelper (#12545)	2019-12-05 00:50:40 +01:00