Fix Conflicts:
.gitignore index.html js/controllers/backup.js js/controllers/sidebar.js
This commit is contained in:
commit
85aa5842f1
74 changed files with 5237 additions and 200 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -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/
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue