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		6 years ago
..
environments	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
initializers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago
locales	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
webpack	Merge branch 'master' into glitch-soc/merge	6 years ago
application.rb	Merge branch 'master' into glitch-soc/merge	6 years ago
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	6 years ago
navigation.rb	…
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/merge	6 years ago
secrets.yml	…
settings.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
sidekiq.yml	…
webpacker.yml	…