{
  "name" : "fineUploaderAngularExample",
  "description" : "Fine Uploader Angular & NodeJS example",
  "dependencies" : {
    "angular": "1.4.x",
    "dialog-polyfill": "0.4.2",
    "express": "4.13.3",
    "fine-uploader": "~5.x.x",
    "fine-uploader-traditional-server": "3.0.2",
    "mkdirp": "0.5.1",
    "rimraf": "2.5.0"
  },
  "engines": {
    "node" : ">=5.0.0"
  },
  "version" : "1.0.0",
  "scripts": {
    "server": "PUBLIC_DIR=$(pwd)  NODE_MODULES_DIR=$(pwd)/node_modules/  UPLOADED_FILES_DIR=$(pwd)/uploads/ node node_modules/fine-uploader-traditional-server/nodejs"
  }
}

{
  "name" : "fineUploaderAngularExample",
  "description" : "Fine Uploader Angular & NodeJS example",
  "dependencies" : {
    "angular": "1.4.x",
    "dialog-polyfill": "0.4.2",
    "fine-uploader": "~5.x.x",
    "fine-uploader-traditional-server": "3.0.2"
  },
  "engines": {
    "node" : ">=5.0.0"
  },
  "version" : "1.0.0",
  "scripts": {
    "server": "PUBLIC_DIR=$(pwd)  NODE_MODULES_DIR=$(pwd)/node_modules/  UPLOADED_FILES_DIR=$(pwd)/uploads/ node node_modules/fine-uploader-traditional-server/nodejs"
  }
}

Merge remote-tracking branch 'origin/update-angular-example' into update-angular-example
chore(merge): Merge remote-tracking branch 'origin/update-angular-example' into update-angular-example

# Conflicts:
#	src/angularjs-nodejs/package.json
#1
