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.

David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		7 years ago
..
chewy	…
controllers	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
helpers	Merge branch 'master' into glitch-soc/merge	7 years ago
javascript	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
lib	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
mailers	…
models	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
policies	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
presenters	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
serializers	Merge branch 'master' into glitch-soc/merge	7 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
validators	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
views	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
workers	Add REST API for Web Push Notifications subscriptions (#7445)	7 years ago