Merge branch 'master' into scrumboard-app

# Conflicts:
#	package.json
This commit is contained in:
mustafahlvc 2017-08-30 15:11:21 +03:00
parent 9106fcd066
commit 7d5693421f

View File

@ -35,6 +35,7 @@
"hammerjs": "2.0.8",
"highlight.js": "9.12.0",
"intl": "1.2.5",
"md2": "0.0.28",
"moment": "2.18.1",
"ngx-color-picker": "4.3.1",
"ngx-cookie-service": "1.0.7",