David Yip eb39db7f93 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml		2018-04-01 20:24:50 -05:00
..
environments	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-20 19:17:20 +00:00
initializers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-25 15:17:21 +00:00
locales	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-01 20:24:50 -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 'tootsuite/master' into glitchsoc/master	2018-03-20 19:17:20 +00:00
boot.rb
brakeman.ignore	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
database.yml
deploy.rb
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	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
secrets.yml
settings.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-09 09:25:53 -06:00
sidekiq.yml	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
webpacker.yml