# Conflicts: # public/views/includes/confirmBackupPopup.html # src/js/controllers/backup.js |
||
|---|---|---|
| .. | ||
| img | ||
| roboto-font | ||
| views | ||
| cordova.js | ||
| index.html | ||
# Conflicts: # public/views/includes/confirmBackupPopup.html # src/js/controllers/backup.js |
||
|---|---|---|
| .. | ||
| img | ||
| roboto-font | ||
| views | ||
| cordova.js | ||
| index.html | ||