Merge branch 'upgrade/node10' into server-npm-integration
authorTravis Webb <me@traviswebb.com>
Thu, 12 Jun 2014 15:19:07 +0000 (11:19 -0400)
committerTravis Webb <me@traviswebb.com>
Thu, 12 Jun 2014 15:19:07 +0000 (11:19 -0400)
commit9d0f1885df8e73d0bbee04b72d545c196826dac9
tree6900d72fc642f108ba5e314c4812266476cf69b8
parent8e1fd18b1052797e46ac23c29137f91de6761604
parent1c7d298c07ba2ad1cc1242c6d4fcf3827eb83497
Merge branch 'upgrade/node10' into server-npm-integration

Conflicts:
package.json
scripts/install_xtuple.sh
package.json
scripts/install_xtuple.sh