Thibaut Girka 343acd96cc Merge branch 'master' into glitch-soc/merge-upstream		2018-09-20 18:36:00 +02:00
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-20 18:36:00 +02:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
boot.rb
brakeman.ignore	Add animate custom emoji param to embed pages (#8507)	2018-08-30 23:14:01 +02:00
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-17 22:05:25 +02:00
puma.rb	Revert "Default puma to running on localhost only." (#8444)	2018-08-26 00:13:22 +02:00
routes.rb	Allow to show a specific status in the admin interface	2018-09-03 18:19:11 +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	Fix building assets in test environment	2018-09-13 15:32:02 +02:00