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		2018-05-18 08:47:10 -05:00
..
environments	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
initializers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-18 00:17:23 +00:00
locales	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
webpack	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
application.rb	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	2018-05-10 00:03:34 +02:00
navigation.rb
puma.rb
routes.rb	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
secrets.yml
settings.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
sidekiq.yml
webpacker.yml