Merge branch 'develop-2.x' into new/auth-deep-link

6091ee3d · Lucio Maciel · GitHub · 81a35435 · ee50029f · 6091ee3d
Unverified Commit 6091ee3d authored Apr 16, 2018 by Lucio Maciel Committed by GitHub Apr 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

backup_config.xml app/src/main/res/xml/backup_config.xml +5 -3

No files found.
--- a/app/src/main/res/xml/backup_config.xml
+++ b/app/src/main/res/xml/backup_config.xml
 <?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
+<full-backup-content xmlns:tools="http://schemas.android.com/tools">
    <include domain="sharedpref" path="."/>
-    <exclude domain="sharedpref" path="messages.xml"/>
-    <exclude domain="file" path="instant-run"/>
+    <exclude domain="sharedpref" path="messages.xml"
+        tools:ignore="FullBackupContent" />
+    <exclude domain="file" path="instant-run"
+        tools:ignore="FullBackupContent" />
 </full-backup-content>