Merge branch 'master' into customer/top-drawer

FoxComm · Nov 25, 2016 · 948666f · 948666f
2 parents 6e58dd5 + e5e56a3
commit 948666f
Show file tree

Hide file tree

Showing 114 changed files with 5,398 additions and 610 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,5 +15,4 @@ ashes/public_key.pem
 .env.local
 
 # target folder
-target/
 middlewarehouse/consumers/shipstation/shipstation-consumer
diff --git a/api-docs/.nvmrc b/api-docs/.nvmrc
@@ -1 +1 @@
-v6.2.1
+v6.9.1
diff --git a/api-docs/Makefile b/api-docs/Makefile
@@ -4,7 +4,7 @@ PORT ?= 3000
 all: clean install build
 
 install:
-	npm install
+	yarn --pure-lockfile
 
 build: install
 	mkdir -p $(BUILD_DIR)

diff --git a/api-docs/package.json b/api-docs/package.json
@@ -2,11 +2,11 @@
   "name": "api-docs",
   "description": "Phoenix API documentation in API Blueprint format",
   "repository": {
-  	"type": "git",
-  	"url": "https://github.com/FoxComm/api-docs"
+    "type": "git",
+    "url": "https://github.com/FoxComm/api-docs"
   },
   "dependencies": {
     "aglio-theme-olio": "1.6.3",
-    "aglio": "2.2.1"
+    "aglio": "2.3.0"
   }
 }