Merge branch 'release/1.1.1'

Conflicts: bower.json package.json
bullhorn · Sep 2, 2015 · 219502b · 219502b
2 parents 5a9c0dd + eba1fa2
commit 219502b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "CareerPortal",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "dependencies": {
         "angular": "~1.4.3",
         "angular-animate": "~1.4.3",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "CareerPortal",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "devDependencies": {
         "babel-core": "~5.8.21",
         "babel-loader": "~5.3.2",

diff --git a/src/app/index.module.js b/src/app/index.module.js
@@ -44,7 +44,7 @@ deferredBootstrapper.bootstrap({
     resolve: {
         configuration: function ($http) {
             'ngInject';
-            return $http.get('/app.json');
+            return $http.get('./app.json');
         }
     }
 });