Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		2019-10-27 12:14:01 +01:00
..
admin	Add search and sort functions to hashtag admin UI (#11829)	2019-09-16 14:27:29 +02:00
settings
accounts_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +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	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
flashes_helper.rb
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
settings_helper.rb	Add br, es-AR, et, mk, nn to available locales (#12062)	2019-10-03 03:59:43 +02:00
statuses_helper.rb	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +02:00