Merge branch 'master' into kondor

2016-12-13 19:55:49 +01:00 · 2016-12-13 19:55:49 +01:00 · 4b5935b633
parent 789d8f694c 8eb5ed298e
commit 4b5935b633
2 changed files with 4 additions and 1 deletions
--- a/bower.json
+++ b/bower.json
@ -23,5 +23,8 @@
    "angular-sanitize": "^1.5.8",
    "angular-ui-tree": "^2.21.2",
    "angular-markdown-editor-ghiscoding": "^1.0.7"
+  },                                                                                          
+  "resolutions":{
+    "angular": "1.6.0"
  }
 }
--- a/public/components/config.js
+++ b/public/components/config.js
@ -2,7 +2,7 @@
 angular.module('config', [])
 	.factory('config', function() {
 		return {
-			api: 'http://api.server.kondor-solutions.de',
+			api: 'https://api.server.kondor-solutions.de',
 			table: {
 				count: 25
 			}