Merge branch 'dev' into 'master'

Dev See merge request !58
4 jobs from master in 6 seconds (queued for 1 second)
Status Job ID Name Coverage
  Init
failed #211115
init

00:06

 
  Bootstrap
skipped #211116
bootstrap
 
  Build
skipped #211117
build
 
  Release
skipped #211118
release
 
Name Stage Failure
failed
init Init
Updating 0eef04e..c851ab6
error: Your local changes to the following files would be overwritten by merge:
package.json
Please commit your changes or stash them before you merge.
Aborting


Cleaning up project directory and file based variables
ERROR: Job failed: exit status 1