Merge branch 'google_drive' into helix_google_drive

Conflicts:
	resources/lib/backup.py
This commit is contained in:
Rob Weber
2014-11-21 13:42:12 -06:00
15 changed files with 1592 additions and 15 deletions

View File

@ -84,4 +84,5 @@
<string id="30090">The destination may not be writeable</string>
<string id="30091">Zip archive could not be copied</string>
<string id="30092">Not all files were copied</string>
<string id="30093">Google Drive</string>
</strings>