Merge branch 'buildFix' of https://github.com/jokajak/password-manager

Conflicts: frontend/gamma/properties/gamma.properties.json
2012-03-17 21:28:40 +00:00
parent 25029b9437 d791e1df1f
commit 12cd9d47a6
3 changed files with 7 additions and 4 deletions
--- a/frontend/gamma/properties/gamma.properties.json
+++ b/frontend/gamma/properties/gamma.properties.json
@@ -188,4 +188,4 @@
 	"css": [
 		"web.css"
 	]
-}
+}