Merge branch 'Feature/issue21'

a195d0bc · Evren Kutar · 3434c697 · c0984834 · a195d0bc · a195d0bc
Commit a195d0bc authored Dec 01, 2015 by Evren Kutar
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Gruntfile.js Gruntfile.js +1 -1

app.js dist/app.js +2 -1

No files found.
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -109,7 +109,7 @@ module.exports = function (grunt) {
                    "app/app_routes.js",
                    "app/zetalib/interceptors.js",
                    "app/zetalib/general.js",
-                    "app/zetalib/forms/form_service.js",
+                    "app/zetalib/form_service.js",
                    "app/shared/directives.js",
                    "app/components/auth/auth_controller.js",
                    "app/components/auth/auth_service.js",

--- a/dist/app.js
+++ b/dist/app.js