From e970fecf8e5d6e939c14d576abda546167782f92 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Sun, 6 Mar 2016 22:28:01 -0500 Subject: [PATCH] Revert accidental change from bootstrap to bootstrap-sass in the package.json, and update laravel-elixir to 5.x --- bower.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index fe15fdd..278d3e7 100644 --- a/bower.json +++ b/bower.json @@ -7,13 +7,13 @@ "description": "The Hypothetical website template", "license": "MIT", "dependencies": { + "bootstrap": "^3.3.6", "font-awesome": "~4.5.0", "awesome-bootstrap-checkbox": "~0.3.5", "Sortable": "~1.4.2", "simplemde": "~1.9.0", "datetimepicker": "~2.4.5", "SpinKit": "~1.2.5", - "jQuery.stickyFooter": "https://github.com/miWebb/jQuery.stickyFooter.git#~1.2.3", - "bootstrap-sass": "^3.3.6" + "jQuery.stickyFooter": "https://github.com/miWebb/jQuery.stickyFooter.git#~1.2.3" } } diff --git a/package.json b/package.json index 81341b6..68a8715 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "private": true, "devDependencies": { - "laravel-elixir-livereload": "^1.1.0" + "laravel-elixir-livereload": "^1.1.5-beta1" }, "dependencies": { "gulp": "^3.9.1", - "laravel-elixir": "^3.4.0", + "laravel-elixir": "^5.0.0", "less-plugin-glob": "^1.1.1" } }