From 3e578257f97bbc3fc0c544ccc97312b08aae793e Mon Sep 17 00:00:00 2001
From: Zachary Golba <zachary.golba@postlight.com>
Date: Mon, 24 Oct 2016 12:26:18 -0400
Subject: [PATCH] =?UTF-8?q?release:=201.0.2=20=F0=9F=94=A7=20(#480)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         | 8 ++++++++
 examples/social-network/package.json | 4 ++--
 examples/todo/package.json           | 4 ++--
 package.json                         | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcf58b82..9d1491fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Lux Changelog
 
+### 1.0.2 (Oct 24, 2016)
+
+##### Commits
+
+*   [[`bbf68000ea`](https://github.com/postlight/lux/commit/bbf68000ea)] - **fix**: controllers are not properly resolving for resources with custom paths (#478) (Zachary Golba)
+*   [[`1a52cc1cec`](https://github.com/postlight/lux/commit/1a52cc1cec)] - **deps**: update eslint-plugin-flowtype to version 2.21.0 (#479) (Greenkeeper)
+*   [[`fe35b45935`](https://github.com/postlight/lux/commit/fe35b45935)] - **release**: 1.0.1 🔧 (#477) (Zachary Golba)
+
 ### 1.0.1 (Oct 20, 2016)
 
 ##### Commits
diff --git a/examples/social-network/package.json b/examples/social-network/package.json
index c151b3ba..7c0785d5 100644
--- a/examples/social-network/package.json
+++ b/examples/social-network/package.json
@@ -13,8 +13,8 @@
     "babel-core": "6.14.0",
     "babel-preset-lux": "1.3.0",
     "bcryptjs": "2.3.0",
-    "knex": "0.12.1",
-    "lux-framework": "1.0.1",
+    "knex": "0.12.6",
+    "lux-framework": "1.0.2",
     "sqlite3": "3.1.4"
   },
   "devDependencies": {
diff --git a/examples/todo/package.json b/examples/todo/package.json
index 234b59de..bc6c774a 100644
--- a/examples/todo/package.json
+++ b/examples/todo/package.json
@@ -12,8 +12,8 @@
   "dependencies": {
     "babel-core": "6.14.0",
     "babel-preset-lux": "1.3.0",
-    "knex": "0.12.1",
-    "lux-framework": "1.0.1",
+    "knex": "0.12.6",
+    "lux-framework": "1.0.2",
     "sqlite3": "3.1.4"
   },
   "devDependencies": {
diff --git a/package.json b/package.json
index bf5b751c..e21619f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lux-framework",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Build scalable, Node.js-powered REST APIs with almost no code.",
   "repository": "github:postlight/lux",
   "keywords": [