Commit edc8354b authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'master' into 'prepare_production'

# Conflicts:
#   config/config.js
parents 6da9a2ad e0199f9d
......@@ -9,4 +9,16 @@ pages-devel:
- testing
only:
- testing
- test_logoutbutton
\ No newline at end of file
- test_logoutbutton
pages-devel:
stage: deploy
script:
- npm install
- "pm2 delete --silent account || :"
- pm2 start ./app.js --name=account
- pm2 save
tags:
- production
only:
- master
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment