David Yip 77a92d3260 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: Gemfile.lock		2018-05-04 09:42:31 -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 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
locales	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-04 09:42:31 -05:00
webpack	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-27 10:44:12 -05:00
application.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
boot.rb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
brakeman.ignore	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
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	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-18 20:21:17 -05:00
navigation.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
puma.rb
routes.rb	Direct messages column (#4514)	2018-04-18 13:09:06 +02:00
secrets.yml
settings.yml	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
sidekiq.yml	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
webpacker.yml