Merged branch master and fixed conflict

After Password Strength merge this branch have 2 conflict: - gulpfile.js - public/build/rev-manifest.json All conflicts solved now
2015-10-03 12:53:43 +02:00
parent b6056faa72 b4f7adfdfd
commit e9702e4292
34 changed files with 372 additions and 110 deletions
@@ -1,4 +1,4 @@
 {
-  "dist/css/all.css": "dist/css/all-1fd79ec356.css",
-  "dist/js/all.js": "dist/js/all-29dc2bf4b8.js"
+  "dist/css/all.css": "dist/css/all-fbd1bacde1.css",
+  "dist/js/all.js": "dist/js/all-1c16482be2.js"
 }