mastodon/config
David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream 2017-09-10 13:04:27 -05:00
..
environments Merge tag 'v1.6.0' into sync/upstream 2017-09-10 13:04:27 -05:00
initializers Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
locales Fix Japanese translation (#4876) 2017-09-10 20:34:15 +09:00
webpack Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
application.rb Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb
puma.rb
routes.rb Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
secrets.yml
settings.yml Merge tag 'v1.6.0' into sync/upstream 2017-09-10 13:04:27 -05:00
sidekiq.yml
webpacker.yml