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

Conflicts:
	config/settings.yml

2018-08-01 22:20:25 +02:00

..

environments

…

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-08-01 22:20:25 +02:00

webpack

Reduce assets precompilation time by about 20%

2018-07-28 23:24:41 +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

…

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/merge-upstream

2018-08-01 22:20:25 +02:00

sidekiq.yml

…

webpacker.yml

…