Fix Conflicts:

.gitignore
	index.html
	js/controllers/backup.js
	js/controllers/sidebar.js
This commit is contained in:
Gustavo Maximiliano Cortez 2014-07-28 12:28:07 -03:00
commit 85aa5842f1
74 changed files with 5237 additions and 200 deletions

8
.gitignore vendored
View file

@ -51,6 +51,14 @@ version.js
android/package
android/*.apk
android/*.keystore
mobile/*.keystore
mobile/assets/www
mobile/bin/*
mobile/gen/*
mobile/cordova/*
mobile/CordovaLib/*
coverage/