samuel-p/universal-statuspage
Archived
1
0
Fork 0
Code Issues 3 Pull requests Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source 
# Conflicts:
#	package.json
This commit is contained in:
Samuel Philipp 2021-01-10 16:06:39 +01:00
commit 2227622f0e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM node:14.14.0-alpine FROM node:14.15.4-alpine
COPY dist/universal-statuspage /universal-statuspage COPY dist/universal-statuspage /universal-statuspage

6
package.json
View file

@ -27,7 +27,7 @@
"@angular/platform-server": "~11.0.2", "@angular/platform-server": "~11.0.2",
"@angular/router": "~11.0.2", "@angular/router": "~11.0.2",
"@fortawesome/fontawesome-free": "^5.15.1", "@fortawesome/fontawesome-free": "^5.15.1",
"@nguniversal/express-engine": "^11.0.0", "@nguniversal/express-engine": "^11.0.1",
"@ngx-translate/core": "^13.0.0", "@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0", "@ngx-translate/http-loader": "^6.0.0",
"@types/node-cron": "^2.0.3", "@types/node-cron": "^2.0.3",
@ -49,8 +49,8 @@
"@angular/cli": "~11.0.2", "@angular/cli": "~11.0.2",
"@angular/compiler-cli": "~11.0.2", "@angular/compiler-cli": "~11.0.2",
"@angular/language-service": "~11.0.2", "@angular/language-service": "~11.0.2",
"@nguniversal/builders": "^11.0.0", "@nguniversal/builders": "^11.0.1",
"@types/express": "^4.17.8", "@types/express": "^4.17.9",
"@types/node": "^14.0.23", "@types/node": "^14.0.23",
"@types/jasmine": "~3.6.0", "@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",