David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.		2018-06-07 05:13:49 -05:00
..
environments	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-27 13:20:15 +02:00
locales	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-06-07 05:13:49 -05:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-29 13:52:26 +02:00
application.rb	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
boot.rb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
brakeman.ignore
database.yml
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
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 remote-tracking branch 'origin/master' into gs-master	2018-06-03 19:44:05 -05: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