Merge branch 'master' into release

theonion · Mar 31, 2014 · aea0a8f · aea0a8f
2 parents 914ad10 + e1a53a1
commit aea0a8f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -43,7 +43,7 @@ angular.module('bulbsCmsApp', [
       })
       .when('/cms/app/pzones/', {
         templateUrl: PARTIALS_URL + 'pzones.html',
-        controller: 'PZoneCtrl'
+        controller: 'PzoneCtrl'
       })
       .otherwise({
         redirectTo: '/cms/app/list/published/'