Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream

2018-05-29 13:52:26 +02:00

..

environments

…

initializers

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-27 13:20:15 +02:00

locales

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-27 13:20:15 +02:00

webpack

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-29 13:52:26 +02:00

application.rb

…

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

…

environment.rb

…

i18n-tasks.yml

…

navigation.rb

…

puma.rb

…

routes.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-29 13:52:26 +02: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

…