Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.

2018-09-03 14:33:06 +02:00

..

environments

…

initializers

…

locales

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

2018-09-03 14:33:06 +02:00

webpack

…

application.rb

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

2018-09-03 14:33:06 +02:00

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-09-03 14:33:06 +02:00

secrets.yml

…

settings.yml

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

2018-09-03 14:33:06 +02:00

sidekiq.yml

Update docker config and move some workers to different queues (#8345)

2018-09-02 16:13:06 +02:00

webpacker.yml

…