Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2018-02-16 21:23:25 -05:00
80 changed files with 642 additions and 281 deletions

View File

@@ -283,7 +283,7 @@ module.exports = function (middleware) {
}
if (skinToUse) {
obj.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + skinToUse + '/bootstrap.min.css';
obj.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/3.3.7/' + skinToUse + '/bootstrap.min.css';
}
}
}