Merge branch 'master' into kondor
This commit is contained in:
commit
4b5935b633
|
@ -23,5 +23,8 @@
|
||||||
"angular-sanitize": "^1.5.8",
|
"angular-sanitize": "^1.5.8",
|
||||||
"angular-ui-tree": "^2.21.2",
|
"angular-ui-tree": "^2.21.2",
|
||||||
"angular-markdown-editor-ghiscoding": "^1.0.7"
|
"angular-markdown-editor-ghiscoding": "^1.0.7"
|
||||||
|
},
|
||||||
|
"resolutions":{
|
||||||
|
"angular": "1.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
angular.module('config', [])
|
angular.module('config', [])
|
||||||
.factory('config', function() {
|
.factory('config', function() {
|
||||||
return {
|
return {
|
||||||
api: 'http://api.server.kondor-solutions.de',
|
api: 'https://api.server.kondor-solutions.de',
|
||||||
table: {
|
table: {
|
||||||
count: 25
|
count: 25
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue