From 734a6b49d4c88ea6431d2793b49477aed70fc220 Mon Sep 17 00:00:00 2001
From: Kelly Selden <kellyselden@gmail.com>
Date: Sat, 30 May 2015 20:14:21 -0400
Subject: [PATCH] 0.2.6

---
 .watchmanconfig    | 3 +++
 app/app.js         | 1 +
 app/views/.gitkeep | 0
 bower.json         | 2 +-
 package.json       | 6 +++---
 5 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 .watchmanconfig
 delete mode 100644 app/views/.gitkeep

diff --git a/.watchmanconfig b/.watchmanconfig
new file mode 100644
index 0000000..5e9462c
--- /dev/null
+++ b/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}
diff --git a/app/app.js b/app/app.js
index 037963b..8d66b95 100644
--- a/app/app.js
+++ b/app/app.js
@@ -9,6 +9,7 @@ Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
 });
 
diff --git a/app/views/.gitkeep b/app/views/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/bower.json b/bower.json
index c310321..6bcad38 100644
--- a/bower.json
+++ b/bower.json
@@ -4,7 +4,7 @@
     "ember": "1.12.0",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.0.0-beta.17",
+    "ember-data": "1.0.0-beta.18",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
     "ember-qunit": "0.3.3",
     "ember-qunit-notifications": "0.0.7",
diff --git a/package.json b/package.json
index 8b14f78..e1ae424 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.5",
+    "ember-cli": "0.2.6",
     "ember-cli-app-version": "0.3.3",
     "ember-cli-babel": "^5.0.0",
     "ember-cli-content-security-policy": "0.4.0",
@@ -30,8 +30,8 @@
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.3.13",
     "ember-cli-uglify": "^1.0.1",
-    "ember-data": "1.0.0-beta.17",
-    "ember-disable-proxy-controllers": "^0.7.0",
+    "ember-data": "1.0.0-beta.18",
+    "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2"
   }
 }