Merge branch 'master' of https://github.com/userapp-io/userapp-javasc…

…ript Conflicts: userapp.client.js
userapp-io · May 31, 2014 · eedc471 · eedc471
2 parents 0a638de + eb2114c
commit eedc471
Show file tree

Hide file tree

Showing 2 changed files with 384 additions and 384 deletions.
diff --git a/bower.json b/bower.json
@@ -1,5 +1,5 @@
 {
 	"name": "userapp",
-	"version": "1.2.1",
+	"version": "1.2.3",
 	"main": "./userapp.client.js"
 }