Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master ... Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.		2020-01-20 15:00:22 +01:00
..
admin	Add ability to filter reports by target account domain (#12154)	2019-11-30 19:53:58 +01:00
settings
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
home_helper.rb
instance_helper.rb
jsonld_helper.rb
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