Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.		2018-08-26 14:23:24 +02:00
..
loaders	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00
configuration.js
development.js	Upgrade webpack to version v4.x (#6655)	2018-07-14 03:56:41 +02:00
generateLocalePacks.js
production.js	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)	2018-08-25 13:27:08 +02:00
shared.js	Reduce assets precompilation time by about 20%	2018-07-28 23:24:41 +02:00
test.js	Upgrade webpack to version v4.x (#6655)	2018-07-14 03:56:41 +02:00
translationRunner.js