You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		6 years ago
..
admin	Add moderation warnings (#9519)	6 years ago
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flashes_helper.rb	…
home_helper.rb	Make avatar and headers respect `auto_play_gif` (#9515)	6 years ago
instance_helper.rb	…
jsonld_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Add support for Malayalam in language filter (#9624)	6 years ago
stream_entries_helper.rb	Rename hide_followers_count helper to hide_followers_count?	6 years ago