You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ae4240d236 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.		6 years ago
..
loaders	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
configuration.js	Merge branch 'master' into glitch-soc/merge	7 years ago
development.js	Upgrade webpack to version v4.x (#6655)	6 years ago
generateLocalePacks.js	Javascript intl8n flavour support	7 years ago
production.js	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)	6 years ago
shared.js	Reduce assets precompilation time by about 20%	6 years ago
test.js	Upgrade webpack to version v4.x (#6655)	6 years ago
translationRunner.js	Fix RFC 5646 Regular Expression (#6190)	7 years ago