Glitch-Shrike/config
Thibaut Girka 6141c2a035 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02: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-07-26 21:22:43 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2018-07-17 22:05:25 +02:00
application.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +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 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-17 22:05:25 +02:00
puma.rb
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-07-17 22:05:25 +02:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
sidekiq.yml
webpacker.yml