Merge branch 'release/0.5.5'

frontend · Jun 16, 2016 · 18c3297 · 18c3297
2 parents a3cd1b8 + 431adbe
commit 18c3297
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/templates/_gulp_config.json b/app/templates/_gulp_config.json
@@ -8,7 +8,7 @@
     "css": [
       ""
     ],
-    "js": [<% if (bootstrapSass) { %>,
+    "js": [<% if (bootstrapSass) { %>
       "node_modules/bootstrap-sass/assets/javascripts/bootstrap/affix.js",
       "node_modules/bootstrap-sass/assets/javascripts/bootstrap/alert.js",
       "node_modules/bootstrap-sass/assets/javascripts/bootstrap/button.js",

diff --git a/app/templates/assets/templates/base.html.swig b/app/templates/assets/templates/base.html.swig
@@ -40,7 +40,7 @@
       </div>
     {% endif %}
 
-    <script src="https://code.jquery.com/jquery-2.2.4.min.js" crossorigin="anonymous"></script>
+    <script src="//code.jquery.com/jquery-2.2.4.min.js" crossorigin="anonymous"></script>
     <script src="/build/js/vendors.min.js"></script>
     <script src="/build/js/bundle.js"></script>
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-toolbox",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Yeoman generator",
   "license": "MIT",
   "main": "app/index.js",