Merge branch 'feature/3-deps' into develop

jacob-meacham · Oct 29, 2015 · 48ee733 · 48ee733
2 parents f1f5290 + 820d075
commit 48ee733
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var app = angular.module('angular-notification-icons.demo', ['ngRoute', 'angular-notification-icons', 'ngAnimate', 'angular-notification-icons.demo.controllers']);
+var app = angular.module('angular-notification-icons.demo', ['ngRoute', 'hljs', 'angular-notification-icons', 'ngAnimate', 'angular-notification-icons.demo.controllers']);
 
 // Pre-define modules
 angular.module('angular-notification-icons.demo.controllers', []);

diff --git a/bower.json b/bower.json
@@ -25,19 +25,18 @@
   "keywords": ["angular", "angular-plugin", "directive", "notification"],
   "authors": [{ "name": "jemonjam", "homepage": "http://jemonjam.com"}],
   "dependencies": {
-    "angular-animate": "~1.3.15",
-    "angular": "~1.3.15"
+    "angular": ">1.3.0"
   },
   "devDependencies": {
-    "angular-mocks": "1.3.15",
-    "angular-route": "1.3.15",
+    "angular-mocks": "1.4.7",
+    "angular-route": "1.4.7",
     "jquery": "2.1.3",
     "bootstrap": "3.3.4",
     "angular-bootstrap": "0.12.1",
     "fontawesome": "~4.3.0",
     "angular-highlightjs": "0.4.1"
   },
   "resolutions": {
-    "angular": "~1.3.15"
+    "angular": "~1.4.7"
   }
 }