From 4cabc931652a434c645ba35594a4e29a72eadcc2 Mon Sep 17 00:00:00 2001
From: Michael Krotscheck <krotscheck@gmail.com>
Date: Wed, 25 Jun 2014 14:11:02 -0700
Subject: [PATCH] Updated AngularJS to 1.2.18

This commit updates angular. We don't have an explicit need for it, but
it's nice to stay up-to-date with the library so we don't have
unexpected surprises.

Change-Id: I5bf959ea0541f7727e890ec371f533ebee132f98
---
 bower.json | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bower.json b/bower.json
index 02cb1a22..990337a1 100644
--- a/bower.json
+++ b/bower.json
@@ -3,9 +3,9 @@
   "version": "0.0.1",
   "dependencies": {
     "font-awesome": "4.0",
-    "angular": "1.2.13",
-    "angular-resource": "1.2.13",
-    "angular-sanitize": "1.2.13",
+    "angular": "1.2.18",
+    "angular-resource": "1.2.18",
+    "angular-sanitize": "1.2.18",
     "bootstrap": "3.1.1",
     "angular-ui-router": "0.2.8-bowratic-tedium",
     "angular-bootstrap": "0.10.0",
@@ -13,7 +13,10 @@
     "angular-elastic": "2.3.2"
   },
   "devDependencies": {
-    "angular-mocks": "1.2.13",
-    "angular-scenario": "1.2.13"
+    "angular-mocks": "1.2.18",
+    "angular-scenario": "1.2.18"
+  },
+  "resolutions": {
+    "angular": "1.2.18"
   }
 }