sum7/warehost-frontend
sum7
/
warehost-frontend
Archived
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into kondor

This commit is contained in:
Martin Geno 2016-12-13 19:55:49 +01:00
parent 789d8f694c 8eb5ed298e
commit 4b5935b633
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -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
public/components/config.js
View File

@ -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
} }