merge
Merge branch 'develop' of https://git.minedu.gov.gr/itminedu/e-epal into loginpage Conflicts: package.json source/app.settings.ts source/app.ts source/components/student-application-form/application.preview.ts source/constants.ts
Showing
... | ... | @@ -32,6 +32,7 @@ |
"tslint-loader": "^2.1.5", | ||
"typescript": "^2.0.10", | ||
"url-loader": "^0.5.7", | ||
"redux-logger": "^2.7.4", | ||
"webpack": "^1.14.0", | ||
"webpack-dashboard": "^0.2.0", | ||
"webpack-dev-server": "^1.16.2" | ||
... | ... |