mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Merge branch 'feature/chat' into developer
This commit is contained in:
+4
-4
@@ -31,14 +31,14 @@
|
|||||||
<output-test url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/intermediates/javac/debugUnitTest/classes" />
|
<output-test url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/intermediates/javac/debugUnitTest/classes" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor">
|
<content url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../../node_modules/@capacitor/android/capacitor/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
|
||||||
|
|||||||
Generated
+2
-2
@@ -30,9 +30,9 @@
|
|||||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$/../../../app">
|
<content url="file://$MODULE_DIR$/../../../app">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||||
|
|||||||
Generated
+4
-4
@@ -31,15 +31,15 @@
|
|||||||
<output-test url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/intermediates/javac/debugUnitTest/classes" />
|
<output-test url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/intermediates/javac/debugUnitTest/classes" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins">
|
<content url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/res/rs/debug" type="java-resource" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/src/debug/res" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/../../../capacitor-cordova-android-plugins/src/debug/res" type="java-resource" />
|
||||||
|
|||||||
Generated
+863
-7
@@ -15,22 +15,259 @@
|
|||||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.lock" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/executionHistory/executionHistory.lock" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.bin" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/fileHashes/fileHashes.lock" afterDir="false" />
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
|
||||||
=======
|
=======
|
||||||
|
>>>>>>> feature/chat
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/6.1.1/javaCompile/javaCompile.lock" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
|
||||||
>>>>>>> feature/chat
|
>>>>>>> feature/chat
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/modules/-195070525/capacitor-android.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/-195070525/capacitor-android.iml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/modules/-195070525/capacitor-android.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/-195070525/capacitor-android.iml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/app.iml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/modules/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/app.iml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/capacitor-cordova-android-plugins/capacitor-cordova-android-plugins.iml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/com/gpr/gabinetedigital/BuildConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/com/gpr/gabinetedigital/BuildConfig.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeLibDexDebug/classes_0.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeLibDexDebug/classes_0.dex" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/debug.json" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeLibDexDebug/classes_1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeLibDexDebug/classes_1.dex" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-af.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-af.json" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-am.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-am.json" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/external_file_lib_dex_archives/debug/out/0_jetified-sqlite-connector.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/external_file_lib_dex_archives/debug/out/0_jetified-sqlite-connector.jar" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ar.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ar.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-as.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-as.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-az.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-az.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-be.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-be.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-bg.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-bg.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-bn.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-bn.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-bs.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-bs.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ca.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ca.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-cs.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-cs.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-da.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-da.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-de.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-de.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-el.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-el.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rAU.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rAU.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rCA.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rCA.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rGB.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rGB.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rIN.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rIN.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rXC.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-en-rXC.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-es-rUS.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-es-rUS.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-es.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-es.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-et.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-et.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-eu.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-eu.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-fa.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-fa.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-fi.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-fi.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-fr-rCA.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-fr-rCA.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-fr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-fr.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-gl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-gl.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-gu.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-gu.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-h360dp-land-v13.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-h360dp-land-v13.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-h480dp-land-v13.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-h480dp-land-v13.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-h720dp-v13.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-h720dp-v13.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hdpi-v4.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hdpi-v4.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hi.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hi.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hr.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hu.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hu.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hy.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-hy.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-in.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-in.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-is.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-is.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-it.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-it.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-iw.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-iw.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ja.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ja.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ka.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ka.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-kk.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-kk.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-km.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-km.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-kn.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-kn.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ko.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ko.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ky.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ky.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-land.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-land.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-large-v4.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-large-v4.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ldltr-v21.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ldltr-v21.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-lo.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-lo.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-lt.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-lt.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-lv.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-lv.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-mk.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-mk.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ml.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ml.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-mn.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-mn.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-mr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-mr.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ms.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ms.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-my.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-my.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-nb.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-nb.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ne.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ne.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-night-v8.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-night-v8.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-nl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-nl.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-or.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-or.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pa.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pa.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pl.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-port.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-port.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rBR.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rBR.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rPT.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pt-rPT.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pt.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-pt.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ro.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ro.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ru.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ru.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-si.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-si.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sk.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sk.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sl.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-small-v4.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-small-v4.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sq.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sq.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sr.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sv.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sv.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sw.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sw.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sw600dp-v13.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-sw600dp-v13.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ta.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ta.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-te.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-te.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-th.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-th.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-tl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-tl.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-tr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-tr.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-uk.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-uk.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ur.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-ur.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-uz.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-uz.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v16.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v16.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v17.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v17.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v18.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v18.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v21.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v21.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v22.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v22.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v23.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v23.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v24.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v24.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v25.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v25.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v26.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v26.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v28.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-v28.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-vi.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-vi.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-w360dp-port-v13.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-w360dp-port-v13.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-w480dp-port-v13.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-w480dp-port-v13.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v20.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v20.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v21.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-watch-v21.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-xlarge-v4.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-xlarge-v4.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rHK.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rHK.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zu.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values-zu.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi-v2/values.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/single/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/single/debug.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/compatible_screen_manifest/debug/out/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compatible_screen_manifest/debug/out/output.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-as/values-as.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-as/values-as.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-az/values-az.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-az/values-az.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-be/values-be.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-be/values-be.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bn/values-bn.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bn/values-bn.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bs/values-bs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bs/values-bs.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rAU/values-en-rAU.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rAU/values-en-rAU.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rCA/values-en-rCA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rCA/values-en-rCA.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rIN/values-en-rIN.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rIN/values-en-rIN.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rXC/values-en-rXC.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rXC/values-en-rXC.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-et/values-et.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-et/values-et.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-eu/values-eu.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-eu/values-eu.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gl/values-gl.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gl/values-gl.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gu/values-gu.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gu/values-gu.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h360dp-land-v13/values-h360dp-land-v13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h360dp-land-v13/values-h360dp-land-v13.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h480dp-land-v13/values-h480dp-land-v13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h480dp-land-v13/values-h480dp-land-v13.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hy/values-hy.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hy/values-hy.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-is/values-is.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-is/values-is.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ka/values-ka.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ka/values-ka.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kk/values-kk.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kk/values-kk.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-km/values-km.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-km/values-km.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kn/values-kn.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kn/values-kn.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ky/values-ky.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ky/values-ky.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-land/values-land.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-land/values-land.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-large-v4/values-large-v4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-large-v4/values-large-v4.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lo/values-lo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lo/values-lo.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lt/values-lt.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lt/values-lt.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lv/values-lv.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lv/values-lv.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mk/values-mk.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mk/values-mk.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ml/values-ml.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ml/values-ml.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mn/values-mn.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mn/values-mn.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mr/values-mr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mr/values-mr.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ms/values-ms.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ms/values-ms.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-my/values-my.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-my/values-my.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nb/values-nb.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nb/values-nb.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ne/values-ne.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ne/values-ne.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-night-v8/values-night-v8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-night-v8/values-night-v8.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nl/values-nl.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nl/values-nl.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-or/values-or.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-or/values-or.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pa/values-pa.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pa/values-pa.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pl/values-pl.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pl/values-pl.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-port/values-port.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-port/values-port.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rBR/values-pt-rBR.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rBR/values-pt-rBR.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rPT/values-pt-rPT.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rPT/values-pt-rPT.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt/values-pt.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt/values-pt.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ro/values-ro.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ro/values-ro.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ru/values-ru.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ru/values-ru.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-si/values-si.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-si/values-si.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sk/values-sk.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sk/values-sk.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sl/values-sl.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sl/values-sl.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-small-v4/values-small-v4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-small-v4/values-small-v4.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sq/values-sq.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sq/values-sq.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sr/values-sr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sr/values-sr.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sv/values-sv.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sv/values-sv.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw/values-sw.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw/values-sw.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ta/values-ta.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ta/values-ta.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-te/values-te.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-te/values-te.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-th/values-th.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-th/values-th.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tl/values-tl.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tl/values-tl.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tr/values-tr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tr/values-tr.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uk/values-uk.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uk/values-uk.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ur/values-ur.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ur/values-ur.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uz/values-uz.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uz/values-uz.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v16/values-v16.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v16/values-v16.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v17/values-v17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v17/values-v17.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v18/values-v18.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v18/values-v18.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v21/values-v21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v21/values-v21.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v22/values-v22.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v22/values-v22.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v23/values-v23.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v23/values-v23.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v24/values-v24.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v24/values-v24.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v25/values-v25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v25/values-v25.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v26/values-v26.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v26/values-v26.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v28/values-v28.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v28/values-v28.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-w360dp-port-v13/values-w360dp-port-v13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-w360dp-port-v13/values-w360dp-port-v13.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-w480dp-port-v13/values-w480dp-port-v13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-w480dp-port-v13/values-w480dp-port-v13.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v20/values-watch-v20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v20/values-watch-v20.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v21/values-watch-v21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v21/values-watch-v21.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" afterDir="false" />
|
||||||
@@ -150,15 +387,195 @@
|
|||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es5.js" afterDir="false" />
|
||||||
=======
|
=======
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/instant_app_manifest/debug/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/instant_app_manifest/debug/output.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/0-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/0-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/0-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/0-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/1-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/1-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/1-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/1-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/10-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/10-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/10-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/10-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/11-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/11-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/11-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/11-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/12-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/12-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/12-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/12-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/13-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/13-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/13-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/13-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/14-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/14-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/14-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/14-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/15-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/15-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/15-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/15-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/16-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/16-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/16-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/16-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/17-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/17-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/17-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/17-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/18-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/18-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/18-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/18-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/19-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/19-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/19-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/19-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/2-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/2-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/2-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/2-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/20-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/20-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/20-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/20-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/21-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/21-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/21-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/21-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/22-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/22-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/22-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/22-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/23-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/23-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/23-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/23-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/24-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/24-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/24-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/24-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/25-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/25-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/25-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/25-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/26-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/26-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/26-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/26-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/27-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/27-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/27-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/27-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/28-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/28-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/28-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/28-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/29-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/29-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/29-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/29-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/3-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/3-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/3-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/3-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/30-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/30-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/30-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/30-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/31-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/31-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/31-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/31-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/32-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/32-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/32-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/32-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/33-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/33-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/33-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/33-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/34-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/34-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/34-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/34-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/35-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/35-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/35-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/35-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/36-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/36-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/36-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/36-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/37-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/37-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/37-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/37-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/38-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/38-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/38-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/38-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/39-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/39-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/39-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/39-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/4-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/4-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/4-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/4-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/40-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/40-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/40-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/40-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/41-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/41-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/41-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/41-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/42-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/42-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/42-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/42-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/43-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/43-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/43-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/43-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/44-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/44-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/44-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/44-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/45-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/45-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/45-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/45-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/46-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/46-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/46-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/46-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/47-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/47-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/47-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/47-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/5-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/5-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/5-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/5-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/6-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/6-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/6-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/6-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/7-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/7-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/7-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/7-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/8-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/8-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/8-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/8-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/9-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/9-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/9-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/9-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/add-participants-modal-add-participants-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/approve-event-modal-approve-event-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/approve-event-modal-approve-event-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/approve-event-modal-approve-event-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/approve-event-modal-approve-event-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/attendee-modal-attendee-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/attendee-modal-attendee-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/attendee-modal-attendee-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/attendee-modal-attendee-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/book-meeting-modal-book-meeting-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/book-meeting-modal-book-meeting-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/book-meeting-modal-book-meeting-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/book-meeting-modal-book-meeting-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/common-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/contacts-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/contacts-contacts-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/contacts-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/contacts-contacts-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/conversation-conversation-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/conversation-conversation-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/conversation-conversation-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/conversation-conversation-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/cordova.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/cordova.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/cordova_plugins.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/cordova_plugins.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/core-js-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/core-js-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/core-js-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/core-js-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expediente-expediente-module~pages-agenda-agenda-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expediente-expediente-module~pages-agenda-agenda-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expediente-expediente-module~pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~expediente-expediente-module~pages-agenda-agenda-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~home-home-module~pages-events-events-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/discart-expedient-modal-discart-expedient-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/dom-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/dom-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/dom-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/dom-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/emend-message-modal-emend-message-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-actions-popover-event-actions-popover-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-detail-modal-event-detail-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-detail-modal-event-detail-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-detail-modal-event-detail-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/event-detail-modal-event-detail-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expedient-task-modal-expedient-task-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/expediente-expediente-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/focus-visible-15ada7f7-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/focus-visible-15ada7f7-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/focus-visible-15ada7f7-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/focus-visible-15ada7f7-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/gallery-gallery-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-chat-group-chat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-chat-group-chat-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-chat-group-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-chat-group-chat-module-es5.js" afterDir="false" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es2015.js.map" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js" afterDir="false" />
|
||||||
|
<<<<<<< HEAD
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-contacts-group-contacts-module-es5.js.map" afterDir="false" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-messages-group-messages-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-messages-group-messages-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-messages-group-messages-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/group-messages-group-messages-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/home-home-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/image-modal-image-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/image-modal-image-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/image-modal-image-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/image-modal-image-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/index-index-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/input-shims-b956f530-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/input-shims-b956f530-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/input-shims-b956f530-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/input-shims-b956f530-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/keyboard-dd970efc-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/keyboard-dd970efc-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/keyboard-dd970efc-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/keyboard-dd970efc-js-es5.js" afterDir="false" />
|
||||||
>>>>>>> feature/chat
|
>>>>>>> feature/chat
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/main-es5.js.map" afterDir="false" />
|
||||||
|
<<<<<<< HEAD
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js" afterDir="false" />
|
||||||
@@ -167,12 +584,28 @@
|
|||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js.map" afterDir="false" />
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/messages-messages-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/messages-messages-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/messages-messages-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/messages-messages-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/native-bridge.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/native-bridge.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-action-new-action-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-action-new-action-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-action-new-action-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-action-new-action-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-group-new-group-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-group-new-group-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-group-new-group-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-group-new-group-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-publication-new-publication-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-publication-new-publication-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-publication-new-publication-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/new-publication-new-publication-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/newchat-newchat-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-agenda-agenda-module-es5.js" afterDir="false" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-chat-chat-module-es5.js.map" afterDir="false" />
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> feature/pushNotifications
|
>>>>>>> feature/pushNotifications
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js" afterDir="false" />
|
||||||
@@ -186,10 +619,17 @@
|
|||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" afterDir="false" />
|
||||||
>>>>>>> feature/pushNotifications
|
>>>>>>> feature/pushNotifications
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-events-events-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-login-login-module-es5.js.map" afterDir="false" />
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" afterDir="false" />
|
||||||
@@ -334,16 +774,285 @@
|
|||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/BuildConfig.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/BuildConfig.dex" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/BuildConfig.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/BuildConfig.dex" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity$1.dex" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity$1.dex" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity.dex" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/gpr/gabinetedigital/MainActivity.dex" afterDir="false" />
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-publications-publications-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-search-search-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-search-search-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-search-search-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/pages-search-search-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-camera/www/Camera.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-camera/www/Camera.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-camera/www/CameraConstants.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-camera/www/CameraConstants.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-camera/www/CameraPopoverHandle.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-camera/www/CameraPopoverHandle.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-camera/www/CameraPopoverOptions.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-camera/www/CameraPopoverOptions.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-device/www/device.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-device/www/device.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/DirectoryEntry.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/DirectoryEntry.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/DirectoryReader.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/DirectoryReader.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/Entry.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/Entry.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/File.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/File.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileEntry.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileEntry.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileError.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileError.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileReader.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileReader.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileSystem.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileSystem.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileUploadOptions.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileUploadOptions.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileUploadResult.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileUploadResult.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileWriter.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/FileWriter.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/Flags.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/Flags.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/LocalFileSystem.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/LocalFileSystem.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/Metadata.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/Metadata.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/ProgressEvent.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/ProgressEvent.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/android/FileSystem.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/android/FileSystem.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/browser/isChrome.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/browser/isChrome.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/fileSystemPaths.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/fileSystemPaths.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/fileSystems-roots.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/fileSystems-roots.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/fileSystems.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/fileSystems.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/requestFileSystem.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/requestFileSystem.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/resolveLocalFileSystemURI.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-file/www/resolveLocalFileSystemURI.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-filepath/www/FilePath.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-filepath/www/FilePath.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-statusbar/www/statusbar.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-plugin-statusbar/www/statusbar.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-sqlite-storage/www/SQLitePlugin.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/plugins/cordova-sqlite-storage/www/SQLitePlugin.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-core-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-core-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-core-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-core-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-css-shim-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-css-shim-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-css-shim-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-css-shim-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-dom-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-dom-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-dom-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-dom-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/polyfills-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/runtime-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shadow-css-d7d058ec-d59cb009-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shadow-css-d7d058ec-d59cb009-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shadow-css-d7d058ec-d59cb009-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shadow-css-d7d058ec-d59cb009-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shadow-css-fc98efba-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shadow-css-fc98efba-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shadow-css-fc98efba-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shadow-css-fc98efba-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-btn-seguinte-btn-seguinte-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-header-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-header-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-header-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-header-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-header-pr-header-pr-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-chat-options-popover-chat-options-popover-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-chat-options-popover-chat-options-popover-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-chat-options-popover-chat-options-popover-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-chat-options-popover-chat-options-popover-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-chat-popover-chat-popover-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-chat-popover-chat-popover-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-chat-popover-chat-popover-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-chat-popover-chat-popover-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-group-duration-group-duration-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-group-duration-group-duration-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-group-duration-group-duration-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-group-duration-group-duration-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es2015.js.map" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/shared-popover-messages-options-messages-options-module-es5.js.map" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/status-tap-a9bf301d-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/status-tap-a9bf301d-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/status-tap-a9bf301d-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/status-tap-a9bf301d-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/stencil-polyfills-css-shim-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/stencil-polyfills-css-shim-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/stencil-polyfills-css-shim-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/stencil-polyfills-css-shim-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/stencil-polyfills-dom-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/stencil-polyfills-dom-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/stencil-polyfills-dom-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/stencil-polyfills-dom-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/styles-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/swipe-back-0a6a44c8-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/swipe-back-0a6a44c8-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/swipe-back-0a6a44c8-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/swipe-back-0a6a44c8-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/swiper-bundle-95afeea2-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/swiper-bundle-95afeea2-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/swiper-bundle-95afeea2-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/swiper-bundle-95afeea2-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/tap-click-252af35a-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/tap-click-252af35a-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/tap-click-252af35a-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/tap-click-252af35a-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/vendor-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/vendor-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/vendor-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_assets/debug/out/public/vendor-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/output.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/metadata_feature_manifest/debug/metadata-feature/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/metadata_feature_manifest/debug/metadata-feature/output.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/output.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" afterDir="false" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/output-metadata.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/capacitor.build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/capacitor.build.gradle" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/0-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/0-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/0-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/0-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/1-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/1-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/1-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/1-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/10-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/10-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/10-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/10-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/11-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/11-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/11-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/11-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/12-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/12-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/12-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/12-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/13-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/13-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/13-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/13-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/14-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/14-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/14-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/14-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/15-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/15-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/15-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/15-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/16-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/16-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/16-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/16-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/17-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/17-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/17-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/17-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/18-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/18-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/18-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/18-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/19-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/19-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/19-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/19-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/2-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/2-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/2-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/2-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/20-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/20-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/20-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/20-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/21-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/21-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/21-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/21-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/22-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/22-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/22-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/22-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/23-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/23-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/23-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/23-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/24-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/24-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/24-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/24-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/25-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/25-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/25-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/25-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/26-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/26-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/26-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/26-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/27-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/27-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/27-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/27-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/28-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/28-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/28-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/28-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/29-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/29-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/29-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/29-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/3-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/3-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/3-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/3-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/30-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/30-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/30-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/30-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/31-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/31-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/31-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/31-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/32-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/32-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/32-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/32-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/33-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/33-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/33-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/33-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/34-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/34-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/34-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/34-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/35-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/35-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/35-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/35-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/36-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/36-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/36-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/36-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/37-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/37-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/37-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/37-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/38-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/38-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/38-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/38-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/39-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/39-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/39-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/39-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/4-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/4-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/4-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/4-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/40-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/40-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/40-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/40-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/41-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/41-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/41-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/41-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/42-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/42-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/42-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/42-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/43-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/43-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/43-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/43-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/44-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/44-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/44-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/44-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/45-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/45-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/45-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/45-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/46-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/46-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/46-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/46-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/47-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/47-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/47-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/47-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/5-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/5-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/5-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/5-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/6-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/6-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/6-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/6-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/7-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/7-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/7-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/7-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/8-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/8-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/8-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/8-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/9-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/9-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/9-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/9-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-cc-modal-add-participants-cc-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/add-participants-modal-add-participants-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/approve-event-modal-approve-event-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/approve-event-modal-approve-event-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/approve-event-modal-approve-event-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/approve-event-modal-approve-event-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/attendee-modal-attendee-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/attendee-modal-attendee-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/attendee-modal-attendee-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/attendee-modal-attendee-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/book-meeting-modal-book-meeting-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/book-meeting-modal-book-meeting-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/book-meeting-modal-book-meeting-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/book-meeting-modal-book-meeting-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/common-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/contacts-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/contacts-contacts-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/contacts-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/contacts-contacts-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/conversation-conversation-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/conversation-conversation-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/conversation-conversation-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/conversation-conversation-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/cordova.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/cordova.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/cordova_plugins.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/cordova_plugins.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/core-js-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/core-js-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/core-js-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/core-js-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~approve-event-modal-approve-event-modal-module~pages-gabinete-digital-event-list-event-list-~3155d950-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~book-meeting-modal-book-meeting-modal-module~expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~expedient-task-modal-expedient-task-modal-module~expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~expediente-expediente-module~pages-agenda-agenda-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~expediente-expediente-module~pages-agenda-agenda-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~expediente-expediente-module~pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~expediente-expediente-module~pages-agenda-agenda-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~home-home-module~pages-events-events-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-agenda-agenda-module~pages-events-attendees-attendees-module~pages-events-event-detail~1a396e77-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-attachments-attachments-module~pages-events-event-detail-event-detail-module~pa~17dd4d5c-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-events-event-detail-event-detail-module~pages-events-events-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-gabinete-digital-event-list-event-list-module~pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-publication-deta~453c2724-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/default~pages-publications-publications-module~pages-publications-view-publications-view-publications-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/discart-expedient-modal-discart-expedient-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/dom-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/dom-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/dom-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/dom-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/emend-message-modal-emend-message-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/event-actions-popover-event-actions-popover-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/event-detail-modal-event-detail-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/event-detail-modal-event-detail-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/event-detail-modal-event-detail-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/event-detail-modal-event-detail-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expedient-task-modal-expedient-task-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-detail-expediente-detail-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/expediente-expediente-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/focus-visible-15ada7f7-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/focus-visible-15ada7f7-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/focus-visible-15ada7f7-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/focus-visible-15ada7f7-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/gallery-gallery-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-chat-group-chat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-chat-group-chat-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-chat-group-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-chat-group-chat-module-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es2015.js.map" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js" afterDir="false" />
|
||||||
|
<<<<<<< HEAD
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-contacts-group-contacts-module-es5.js.map" afterDir="false" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-messages-group-messages-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-messages-group-messages-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/group-messages-group-messages-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/group-messages-group-messages-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/home-home-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/image-modal-image-modal-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/image-modal-image-modal-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/image-modal-image-modal-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/image-modal-image-modal-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/index-index-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/input-shims-b956f530-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/input-shims-b956f530-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/input-shims-b956f530-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/input-shims-b956f530-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/keyboard-dd970efc-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/keyboard-dd970efc-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/keyboard-dd970efc-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/keyboard-dd970efc-js-es5.js" afterDir="false" />
|
||||||
>>>>>>> feature/chat
|
>>>>>>> feature/chat
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/main-es5.js.map" afterDir="false" />
|
||||||
|
<<<<<<< HEAD
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js" afterDir="false" />
|
||||||
@@ -352,12 +1061,28 @@
|
|||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js.map" afterDir="false" />
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/messages-messages-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/messages-messages-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/messages-messages-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/messages-messages-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/native-bridge.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/native-bridge.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/new-action-new-action-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/new-action-new-action-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/new-action-new-action-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/new-action-new-action-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/new-group-new-group-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/new-group-new-group-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/new-group-new-group-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/new-group-new-group-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/new-publication-new-publication-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/new-publication-new-publication-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/new-publication-new-publication-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/new-publication-new-publication-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/newchat-newchat-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-agenda-agenda-module-es5.js" afterDir="false" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-chat-chat-module-es5.js.map" afterDir="false" />
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> feature/pushNotifications
|
>>>>>>> feature/pushNotifications
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js" afterDir="false" />
|
||||||
@@ -371,10 +1096,17 @@
|
|||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js.map" afterDir="false" />
|
||||||
>>>>>>> feature/pushNotifications
|
>>>>>>> feature/pushNotifications
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-events-events-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-gabinete-digital-gabinete-digital-module-es5.js" afterDir="false" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es2015.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-login-login-module-es5.js.map" afterDir="false" />
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" afterDir="false" />
|
||||||
@@ -408,17 +1140,141 @@
|
|||||||
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js.map" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js.map" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/../src/app/home/home.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/home/home.page.ts" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/../src/app/home/home.page.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../src/app/home/home.page.ts" afterDir="false" />
|
||||||
>>>>>>> feature/pushNotifications
|
>>>>>>> feature/pushNotifications
|
||||||
|
=======
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-publications-publications-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-search-search-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-search-search-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/pages-search-search-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/pages-search-search-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-camera/www/Camera.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-camera/www/Camera.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-camera/www/CameraConstants.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-camera/www/CameraConstants.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-camera/www/CameraPopoverHandle.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-camera/www/CameraPopoverHandle.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-camera/www/CameraPopoverOptions.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-camera/www/CameraPopoverOptions.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-device/www/device.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-device/www/device.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/DirectoryEntry.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/DirectoryEntry.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/DirectoryReader.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/DirectoryReader.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/Entry.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/Entry.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/File.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/File.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileEntry.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileEntry.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileError.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileError.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileReader.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileReader.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileSystem.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileSystem.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileUploadOptions.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileUploadOptions.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileUploadResult.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileUploadResult.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileWriter.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/FileWriter.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/Flags.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/Flags.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/LocalFileSystem.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/LocalFileSystem.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/Metadata.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/Metadata.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/ProgressEvent.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/ProgressEvent.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/android/FileSystem.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/android/FileSystem.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/browser/isChrome.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/browser/isChrome.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/fileSystemPaths.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/fileSystemPaths.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/fileSystems-roots.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/fileSystems-roots.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/fileSystems.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/fileSystems.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/requestFileSystem.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/requestFileSystem.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/resolveLocalFileSystemURI.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-file/www/resolveLocalFileSystemURI.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-filepath/www/FilePath.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-filepath/www/FilePath.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-statusbar/www/statusbar.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-plugin-statusbar/www/statusbar.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-sqlite-storage/www/SQLitePlugin.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/plugins/cordova-sqlite-storage/www/SQLitePlugin.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-core-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-core-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-core-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-core-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-css-shim-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-css-shim-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-css-shim-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-css-shim-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-dom-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-dom-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-dom-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-dom-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/polyfills-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/runtime-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shadow-css-d7d058ec-d59cb009-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shadow-css-d7d058ec-d59cb009-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shadow-css-d7d058ec-d59cb009-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shadow-css-d7d058ec-d59cb009-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shadow-css-fc98efba-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shadow-css-fc98efba-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shadow-css-fc98efba-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shadow-css-fc98efba-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-modal-dismiss-btn-modal-dismiss-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-btn-seguinte-btn-seguinte-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-header-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-header-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-header-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-header-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-header-pr-header-pr-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-chat-options-popover-chat-options-popover-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-chat-options-popover-chat-options-popover-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-chat-options-popover-chat-options-popover-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-chat-options-popover-chat-options-popover-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-chat-popover-chat-popover-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-chat-popover-chat-popover-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-chat-popover-chat-popover-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-chat-popover-chat-popover-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-group-duration-group-duration-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-group-duration-group-duration-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-group-duration-group-duration-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-group-duration-group-duration-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es2015.js.map" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/shared-popover-messages-options-messages-options-module-es5.js.map" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/status-tap-a9bf301d-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/status-tap-a9bf301d-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/status-tap-a9bf301d-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/status-tap-a9bf301d-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/stencil-polyfills-css-shim-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/stencil-polyfills-css-shim-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/stencil-polyfills-css-shim-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/stencil-polyfills-css-shim-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/stencil-polyfills-dom-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/stencil-polyfills-dom-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/stencil-polyfills-dom-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/stencil-polyfills-dom-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/styles-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/styles-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/styles-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/swipe-back-0a6a44c8-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/swipe-back-0a6a44c8-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/swipe-back-0a6a44c8-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/swipe-back-0a6a44c8-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/swiper-bundle-95afeea2-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/swiper-bundle-95afeea2-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/swiper-bundle-95afeea2-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/swiper-bundle-95afeea2-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/tap-click-252af35a-js-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/tap-click-252af35a-js-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/tap-click-252af35a-js-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/tap-click-252af35a-js-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/vendor-es2015.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/vendor-es2015.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/assets/public/vendor-es5.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/assets/public/vendor-es5.js" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/res/xml/config.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/xml/config.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/build.gradle" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/cordova.variables.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/cordova.variables.gradle" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/AndroidManifest.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/com/hiddentao/cordova/filepath/FilePath.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/com/hiddentao/cordova/filepath/FilePath.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/io/sqlc/SQLiteAndroidDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/io/sqlc/SQLiteAndroidDatabase.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/io/sqlc/SQLiteConnectorDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/io/sqlc/SQLiteConnectorDatabase.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/io/sqlc/SQLitePlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/io/sqlc/SQLitePlugin.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/CameraLauncher.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/CameraLauncher.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/ExifHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/ExifHelper.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/FileHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/FileHelper.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/FileProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/FileProvider.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/GalleryPathVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/camera/GalleryPathVO.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/device/Device.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/device/Device.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/AssetFilesystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/AssetFilesystem.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/ContentFilesystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/ContentFilesystem.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/DirectoryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/DirectoryManager.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/EncodingException.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/EncodingException.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/FileExistsException.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/FileExistsException.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/FileUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/FileUtils.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/Filesystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/Filesystem.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/InvalidModificationException.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/InvalidModificationException.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/LocalFilesystem.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/LocalFilesystem.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/LocalFilesystemURL.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/LocalFilesystemURL.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/NoModificationAllowedException.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/NoModificationAllowedException.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/PendingRequests.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/PendingRequests.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/TypeMismatchException.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/file/TypeMismatchException.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/inappbrowser/InAppBrowser.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/inappbrowser/InAppBrowser.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/inappbrowser/InAppBrowserDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/inappbrowser/InAppBrowserDialog.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/inappbrowser/InAppChromeClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/inappbrowser/InAppChromeClient.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/statusbar/StatusBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/statusbar/StatusBar.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/whitelist/WhitelistPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/java/org/apache/cordova/whitelist/WhitelistPlugin.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/res/.gitkeep" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/res/.gitkeep" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/res/xml/camera_provider_paths.xml" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor-cordova-android-plugins/src/main/res/xml/camera_provider_paths.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/capacitor.settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/capacitor.settings.gradle" afterDir="false" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="XU020961" />
|
<component name="ExecutionTargetManager" SELECTED_TARGET="XU020961" />
|
||||||
=======
|
=======
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[XU020585]" />
|
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[XU020585]" />
|
||||||
>>>>>>> feature/pushNotifications
|
>>>>>>> feature/pushNotifications
|
||||||
|
=======
|
||||||
|
<component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_27" />
|
||||||
|
>>>>>>> feature/chat
|
||||||
<component name="ExternalProjectsData">
|
<component name="ExternalProjectsData">
|
||||||
<projectState path="$PROJECT_DIR$">
|
<projectState path="$PROJECT_DIR$">
|
||||||
<ProjectState />
|
<ProjectState />
|
||||||
|
|||||||
+4
@@ -1,5 +1,9 @@
|
|||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#Wed Jan 20 10:20:16 WAT 2021
|
#Wed Jan 20 10:20:16 WAT 2021
|
||||||
|
=======
|
||||||
|
#Mon Jan 25 11:41:48 WAT 2021
|
||||||
|
>>>>>>> feature/chat
|
||||||
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\splash.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_splash.png.flat
|
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\splash.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_splash.png.flat
|
||||||
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_foreground.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_foreground.png.flat
|
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_foreground.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_foreground.png.flat
|
||||||
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
|
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
|
||||||
|
|||||||
+4
@@ -1,5 +1,6 @@
|
|||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#Wed Jan 20 13:37:00 WAT 2021
|
#Wed Jan 20 13:37:00 WAT 2021
|
||||||
=======
|
=======
|
||||||
#Thu Jan 21 09:26:08 WAT 2021
|
#Thu Jan 21 09:26:08 WAT 2021
|
||||||
@@ -7,6 +8,9 @@
|
|||||||
=======
|
=======
|
||||||
#Wed Jan 20 15:30:14 WAT 2021
|
#Wed Jan 20 15:30:14 WAT 2021
|
||||||
>>>>>>> feature/pushNotifications
|
>>>>>>> feature/pushNotifications
|
||||||
|
=======
|
||||||
|
#Mon Jan 25 11:42:31 WAT 2021
|
||||||
|
>>>>>>> feature/chat
|
||||||
path.3=classes_1.dex
|
path.3=classes_1.dex
|
||||||
path.2=classes_0.dex
|
path.2=classes_0.dex
|
||||||
path.1=classes.dex
|
path.1=classes.dex
|
||||||
|
|||||||
@@ -639,10 +639,15 @@ const environment = {
|
|||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||||
|
<<<<<<< HEAD
|
||||||
>>>>>>> feature/chat
|
>>>>>>> feature/chat
|
||||||
=======
|
=======
|
||||||
>>>>>>> feature/pushNotifications
|
>>>>>>> feature/pushNotifications
|
||||||
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
||||||
|
=======
|
||||||
|
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
|
||||||
|
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
|
||||||
|
>>>>>>> feature/chat
|
||||||
domain: 'gabinetedigital.local',
|
domain: 'gabinetedigital.local',
|
||||||
defaultuser: 'paulo.pinto',
|
defaultuser: 'paulo.pinto',
|
||||||
defaultuserpwd: 'tabteste@006'
|
defaultuserpwd: 'tabteste@006'
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -781,10 +781,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|||||||
=======
|
=======
|
||||||
|
|
||||||
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||||
|
<<<<<<< HEAD
|
||||||
>>>>>>> feature/chat
|
>>>>>>> feature/chat
|
||||||
=======
|
=======
|
||||||
>>>>>>> feature/pushNotifications
|
>>>>>>> feature/pushNotifications
|
||||||
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
||||||
|
=======
|
||||||
|
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
|
||||||
|
|
||||||
|
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
|
||||||
|
>>>>>>> feature/chat
|
||||||
domain: 'gabinetedigital.local',
|
domain: 'gabinetedigital.local',
|
||||||
defaultuser: 'paulo.pinto',
|
defaultuser: 'paulo.pinto',
|
||||||
defaultuserpwd: 'tabteste@006'
|
defaultuserpwd: 'tabteste@006'
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+134
-25
@@ -35,7 +35,7 @@ __webpack_require__.r(__webpack_exports__);
|
|||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
__webpack_require__.r(__webpack_exports__);
|
__webpack_require__.r(__webpack_exports__);
|
||||||
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"groupMessages()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
|
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"back-icon\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"div-title\">\r\n <ion-label class=\"title\">Contactos</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"createGroup()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n <ion-toolbar class=\"toolbar-search\">\r\n <div class=\"search\">\r\n <ion-searchbar debounce=\"500\" (ionChange)=\"onChange($event)\" placeholder=\"Pesquisar por cantacto\" ></ion-searchbar>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <ion-refresher name=\"refresher\" slot=\"fixed\" (ionRefresh)=\"doRefresh($event)\">\r\n <ion-progress-bar type=\"indeterminate\" *ngIf=\"showLoader\"></ion-progress-bar>\r\n <ion-refresher-content>\r\n </ion-refresher-content>\r\n </ion-refresher>\r\n \r\n <div class=\"main-content\">\r\n <ion-virtual-scroll [items]=\"users | filter:textSearch: 'name'\" approxItemHeight=\"70px\" [headerFn]=\"separateLetter\">\r\n \r\n <div class=\"item-divider\" *virtualHeader=\"let header\">\r\n <ion-label>{{header}}</ion-label>\r\n </div>\r\n\r\n <div *virtualItem=\"let user\" class=\"item-checkbox\">\r\n <ion-checkbox (ionChange)=\"selectedContact(user)\" color=\"primary\"></ion-checkbox>\r\n <p>{{user.name}}</p>\r\n <ion-icon name=\"ellipse\"></ion-icon>\r\n </div>\r\n \r\n </ion-virtual-scroll>\r\n \r\n </div> \r\n</ion-content>\r\n");
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ __webpack_require__.r(__webpack_exports__);
|
|||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
__webpack_require__.r(__webpack_exports__);
|
__webpack_require__.r(__webpack_exports__);
|
||||||
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"header-top\">\r\n <app-btn-modal-dismiss></app-btn-modal-dismiss>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">{{room.name}}</ion-label>\r\n </div>\r\n <div class=\"right\">\r\n <ion-icon (click)=\"openOptions()\" src=\"assets/images/icons-menu.svg\"></ion-icon>\r\n </div> \r\n </div>\r\n <div class=\"header-bottom\">\r\n <div class=\"header-bottom-icon\">\r\n <ion-icon (click)=\"addContacts()\" src=\"assets/icon/icons-user.svg\"></ion-icon>\r\n </div>\r\n <div class=\"header-bottom-contacts\">\r\n <ion-label *ngFor=\"let member of members\" >\r\n {{member.name}},\r\n </ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n\r\n<ion-content>\r\n <div class=\"welcome-text\">\r\n <ion-label>Esta conversa passou a grupo</ion-label><br />\r\n <ion-label>A conversa original mantêm-se como chat individual</ion-label>\r\n </div>\r\n <div class=\"messages\">\r\n <div *ngFor=\"let msg of messages\" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>\r\n <div class=\"title\">\r\n <ion-label>{{msg.u.username}}</ion-label>\r\n <span class=\"time\">{{msg._updatedAt | date: 'HH:mm' }}</span>\r\n </div>\r\n <div>\r\n <ion-label>{{msg.msg}}</ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n\r\n</ion-content>\r\n<ion-footer>\r\n <ion-toolbar>\r\n <ion-row align-items-center class=\"row\">\r\n <ion-col size=\"1\">\r\n <ion-label class=\"ion-no-padding\" lines=\"none\">\r\n <ion-icon (click)=\"openChatOptions()\" class=\"chat-icon-options\" src=\"assets/icon/icons-chat-options.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n <ion-col size=\"9\">\r\n <ion-item class=\"ion-no-padding type-message\" lines=\"none\">\r\n <ion-textarea placeholder=\"Escrever uma mensagem\" auto-grow class=\"message-input\" rows=\"1\" [(ngModel)]=\"message\"></ion-textarea>\r\n <ion-icon slot=\"end\" src=\"assets/icon/icons-chat-mic.svg\"></ion-icon>\r\n </ion-item>\r\n </ion-col>\r\n <ion-col size=\"2\">\r\n <!-- [disabled]=\"message === ''\" -->\r\n <ion-label>\r\n <ion-icon (click)=\"sendMessage()\" class=\"chat-icon-send\" src=\"assets/icon/icons-chat-send.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n </ion-row>\r\n </ion-toolbar>\r\n</ion-footer>\r\n");
|
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"header-top\">\r\n <app-btn-modal-dismiss></app-btn-modal-dismiss>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">{{room.name}}</ion-label>\r\n </div>\r\n <div class=\"right\">\r\n <ion-icon (click)=\"openOptions()\" src=\"assets/images/icons-menu.svg\"></ion-icon>\r\n </div> \r\n </div>\r\n <div (click)=\"addContacts()\" class=\"header-bottom\">\r\n <div class=\"header-bottom-icon\">\r\n <ion-icon src=\"assets/icon/icons-user.svg\"></ion-icon>\r\n </div>\r\n <div class=\"header-bottom-contacts\">\r\n <ion-label *ngFor=\"let member of members\" >\r\n {{member.name}},\r\n </ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n\r\n<ion-content>\r\n <div class=\"welcome-text\">\r\n <ion-label>Esta conversa passou a grupo</ion-label><br />\r\n <ion-label>A conversa original mantêm-se como chat individual</ion-label>\r\n </div>\r\n <div class=\"messages\">\r\n <div *ngFor=\"let msg of messages\" class='incoming-{{msg.u.username!=loggedUser.me.username}}'>\r\n <div class=\"title\">\r\n <ion-label>{{msg.u.username}}</ion-label>\r\n <span class=\"time\">{{msg._updatedAt | date: 'HH:mm' }}</span>\r\n </div>\r\n <div>\r\n <ion-label>{{msg.msg}}</ion-label>\r\n </div>\r\n </div>\r\n </div>\r\n\r\n</ion-content>\r\n<ion-footer>\r\n <ion-toolbar>\r\n <ion-row align-items-center class=\"row\">\r\n <ion-col size=\"1\">\r\n <ion-label class=\"ion-no-padding\" lines=\"none\">\r\n <ion-icon (click)=\"openChatOptions()\" class=\"chat-icon-options\" src=\"assets/icon/icons-chat-options.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n <ion-col size=\"9\">\r\n <ion-item class=\"ion-no-padding type-message\" lines=\"none\">\r\n <ion-textarea placeholder=\"Escrever uma mensagem\" auto-grow class=\"message-input\" rows=\"1\" [(ngModel)]=\"message\"></ion-textarea>\r\n <ion-icon slot=\"end\" src=\"assets/icon/icons-chat-mic.svg\"></ion-icon>\r\n </ion-item>\r\n </ion-col>\r\n <ion-col size=\"2\">\r\n <!-- [disabled]=\"message === ''\" -->\r\n <ion-label>\r\n <ion-icon (click)=\"sendMessage()\" class=\"chat-icon-send\" src=\"assets/icon/icons-chat-send.svg\"></ion-icon>\r\n </ion-label>\r\n </ion-col>\r\n </ion-row>\r\n </ion-toolbar>\r\n</ion-footer>\r\n");
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
@@ -100,7 +100,7 @@ __webpack_require__.r(__webpack_exports__);
|
|||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
__webpack_require__.r(__webpack_exports__);
|
__webpack_require__.r(__webpack_exports__);
|
||||||
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"left\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">Novo Grupo</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"addContacts()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <div class=\"main-content\">\r\n <div class=\"item-container\">\r\n <ion-input placeholder=\"Título\"></ion-input>\r\n </div>\r\n <div class=\"item-container-no-border\">\r\n <ion-checkbox (ionChange)=\"_ionChange($event)\" color=\"primary\"></ion-checkbox>\r\n <ion-label>Grupo Ultra-secreto</ion-label>\r\n </div>\r\n\r\n <div *ngIf=\"showDuration\" class=\"container-div\">\r\n <div class=\"ion-item-class-2\">\r\n <div class=\"ion-icon-class\">\r\n <ion-icon slot=\"start\" src=\"assets/images/icons-duration.svg\"></ion-icon>\r\n </div>\r\n <div class=\"ion-input-class\">\r\n <ion-input (click)=\"showPicker()\" [(ngModel)]=\"displayDuration\" placeholder=\"Duração\"></ion-input>\r\n </div>\r\n </div>\r\n </div>\r\n \r\n </div> \r\n</ion-content>\r\n");
|
/* harmony default export */ __webpack_exports__["default"] = ("<ion-header class=\"ion-no-border\">\r\n <ion-toolbar class=\"header-toolbar\">\r\n <div class=\"main-header\">\r\n <div class=\"title-content\">\r\n <div class=\"left\">\r\n <ion-icon (click)=\"close()\" slot=\"end\" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>\r\n </div>\r\n <div class=\"middle\">\r\n <ion-label class=\"title\">Novo Grupo</ion-label>\r\n </div>\r\n <app-btn-seguinte (click)=\"addContacts()\"></app-btn-seguinte>\r\n </div>\r\n </div>\r\n </ion-toolbar>\r\n</ion-header>\r\n\r\n<ion-content>\r\n <div class=\"main-content\">\r\n <div class=\"item-container\">\r\n <ion-input [(ngModel)]=\"groupName\" placeholder=\"Título\"></ion-input>\r\n </div>\r\n <div class=\"item-container-no-border\">\r\n <ion-checkbox (ionChange)=\"_ionChange($event)\" color=\"primary\"></ion-checkbox>\r\n <ion-label>Grupo Ultra-secreto</ion-label>\r\n </div>\r\n\r\n <div *ngIf=\"showDuration\" class=\"container-div\">\r\n <div class=\"ion-item-class-2\">\r\n <div class=\"ion-icon-class\">\r\n <ion-icon slot=\"start\" src=\"assets/images/icons-duration.svg\"></ion-icon>\r\n </div>\r\n <div class=\"ion-input-class\">\r\n <ion-input (click)=\"showPicker()\" [(ngModel)]=\"displayDuration\" placeholder=\"Duração\"></ion-input>\r\n </div>\r\n </div>\r\n </div>\r\n \r\n </div> \r\n</ion-content>\r\n");
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
@@ -616,7 +616,9 @@ __webpack_require__.r(__webpack_exports__);
|
|||||||
/* harmony import */ var _ionic_angular__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @ionic/angular */ "./node_modules/@ionic/angular/__ivy_ngcc__/fesm2015/ionic-angular.js");
|
/* harmony import */ var _ionic_angular__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @ionic/angular */ "./node_modules/@ionic/angular/__ivy_ngcc__/fesm2015/ionic-angular.js");
|
||||||
/* harmony import */ var src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/auth.service */ "./src/app/services/auth.service.ts");
|
/* harmony import */ var src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/auth.service */ "./src/app/services/auth.service.ts");
|
||||||
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
|
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
|
||||||
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
|
/* harmony import */ var _new_group_new_group_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../new-group/new-group.page */ "./src/app/pages/chat/new-group/new-group.page.ts");
|
||||||
|
/* harmony import */ var _group_messages_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../group-messages.page */ "./src/app/pages/chat/group-messages/group-messages.page.ts");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -625,11 +627,12 @@ __webpack_require__.r(__webpack_exports__);
|
|||||||
|
|
||||||
|
|
||||||
let GroupContactsPage = class GroupContactsPage {
|
let GroupContactsPage = class GroupContactsPage {
|
||||||
constructor(modalController, http, chatService, authService) {
|
constructor(modalController, http, chatService, authService, navParams) {
|
||||||
this.modalController = modalController;
|
this.modalController = modalController;
|
||||||
this.http = http;
|
this.http = http;
|
||||||
this.chatService = chatService;
|
this.chatService = chatService;
|
||||||
this.authService = authService;
|
this.authService = authService;
|
||||||
|
this.navParams = navParams;
|
||||||
this.users = [];
|
this.users = [];
|
||||||
this.contact = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
|
this.contact = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
|
||||||
this.authService.userData$.subscribe((res) => {
|
this.authService.userData$.subscribe((res) => {
|
||||||
@@ -638,9 +641,14 @@ let GroupContactsPage = class GroupContactsPage {
|
|||||||
this.textSearch = "";
|
this.textSearch = "";
|
||||||
this.dm = null;
|
this.dm = null;
|
||||||
this.room = null;
|
this.room = null;
|
||||||
|
this.isGroupCreated = this.navParams.get('isCreated');
|
||||||
|
this.groupName = this.navParams.get('name');
|
||||||
|
this.room = this.navParams.get('room');
|
||||||
}
|
}
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.loadUsers();
|
this.loadUsers();
|
||||||
|
console.log(this.groupName);
|
||||||
|
console.log(this.isGroupCreated);
|
||||||
}
|
}
|
||||||
loadUsers() {
|
loadUsers() {
|
||||||
this.options = {
|
this.options = {
|
||||||
@@ -648,7 +656,19 @@ let GroupContactsPage = class GroupContactsPage {
|
|||||||
};
|
};
|
||||||
this.chatService.getAllUsers().subscribe((res) => {
|
this.chatService.getAllUsers().subscribe((res) => {
|
||||||
console.log(res.users);
|
console.log(res.users);
|
||||||
this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
|
res.users.forEach(user => {
|
||||||
|
let usr = {
|
||||||
|
"_id": user._id,
|
||||||
|
"username": user.username,
|
||||||
|
"name": user.name,
|
||||||
|
"isChecked": false,
|
||||||
|
};
|
||||||
|
if (this.listContacts == null) {
|
||||||
|
this.listContacts = new Array();
|
||||||
|
}
|
||||||
|
this.listContacts.push(usr);
|
||||||
|
});
|
||||||
|
this.contacts = this.listContacts.filter(data => data.username != this.loggedUser.me.username);
|
||||||
this.users = this.contacts.sort((a, b) => {
|
this.users = this.contacts.sort((a, b) => {
|
||||||
if (a.name < b.name) {
|
if (a.name < b.name) {
|
||||||
return -1;
|
return -1;
|
||||||
@@ -658,6 +678,7 @@ let GroupContactsPage = class GroupContactsPage {
|
|||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
});
|
});
|
||||||
|
console.log(this.users);
|
||||||
this.showLoader = false;
|
this.showLoader = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -675,7 +696,26 @@ let GroupContactsPage = class GroupContactsPage {
|
|||||||
doRefresh(event) {
|
doRefresh(event) {
|
||||||
}
|
}
|
||||||
close() {
|
close() {
|
||||||
this.modalController.dismiss(true);
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||||
|
this.modalController.dismiss();
|
||||||
|
if (this.isGroupCreated) {
|
||||||
|
console.log('go to conversa');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.modalController.dismiss();
|
||||||
|
console.log('go to new group page');
|
||||||
|
const modal = yield this.modalController.create({
|
||||||
|
component: _new_group_new_group_page__WEBPACK_IMPORTED_MODULE_6__["NewGroupPage"],
|
||||||
|
componentProps: {
|
||||||
|
name: this.groupName,
|
||||||
|
duration: '',
|
||||||
|
},
|
||||||
|
cssClass: 'new-group',
|
||||||
|
backdropDismiss: false,
|
||||||
|
});
|
||||||
|
yield modal.present();
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
onChange(event) {
|
onChange(event) {
|
||||||
this.textSearch = event.detail.value;
|
this.textSearch = event.detail.value;
|
||||||
@@ -683,21 +723,72 @@ let GroupContactsPage = class GroupContactsPage {
|
|||||||
clicked() {
|
clicked() {
|
||||||
console.log('clicked');
|
console.log('clicked');
|
||||||
}
|
}
|
||||||
groupMessages() {
|
selectedContact(user) {
|
||||||
|
/* this.groupName = this.room.name; */
|
||||||
|
user.isChecked = !user.isChecked;
|
||||||
|
}
|
||||||
|
addContacts(room) {
|
||||||
|
console.log(room);
|
||||||
|
this.selectedUserList = this.users.filter(function (contact) {
|
||||||
|
return contact.isChecked == true;
|
||||||
|
});
|
||||||
|
console.log(this.selectedUserList);
|
||||||
|
this.selectedUserList.forEach(user => {
|
||||||
|
let body = {
|
||||||
|
"roomId": room._id,
|
||||||
|
"userId": user._id,
|
||||||
|
};
|
||||||
|
this.chatService.addUserToGroup(body).subscribe(res => {
|
||||||
|
console.log(res['success']);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
createGroup() {
|
||||||
|
if (!this.isGroupCreated) {
|
||||||
|
let body = { "name": this.groupName, };
|
||||||
|
this.chatService.addGroup(body).subscribe(res => {
|
||||||
|
console.log('group created');
|
||||||
|
console.log(res['group']);
|
||||||
|
this.addContacts(res['group']);
|
||||||
|
this.openGroupMessages(res['group']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.addContacts(this.room);
|
||||||
|
this.openGroupMessages(this.room);
|
||||||
|
/* this.chatService.getGroupInfo(this.room._id).subscribe(res=>{
|
||||||
|
console.log(res);
|
||||||
|
|
||||||
|
this.addContacts(res['group']);
|
||||||
|
this.openGroupMessages(res['group']);
|
||||||
|
}) */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newGroup() {
|
||||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||||
this.close();
|
this.close();
|
||||||
const modal = yield this.modalController.create({
|
const modal = yield this.modalController.create({
|
||||||
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_6__["GroupMessagesPage"],
|
component: _new_group_new_group_page__WEBPACK_IMPORTED_MODULE_6__["NewGroupPage"],
|
||||||
componentProps: {},
|
cssClass: 'new-group',
|
||||||
cssClass: 'contacts',
|
backdropDismiss: false,
|
||||||
|
});
|
||||||
|
yield modal.present();
|
||||||
|
modal.onDidDismiss();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
openGroupMessages(room) {
|
||||||
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||||
|
this.close();
|
||||||
|
const modal = yield this.modalController.create({
|
||||||
|
component: _group_messages_page__WEBPACK_IMPORTED_MODULE_7__["GroupMessagesPage"],
|
||||||
|
componentProps: {
|
||||||
|
room: room,
|
||||||
|
},
|
||||||
|
cssClass: 'group-messages',
|
||||||
backdropDismiss: false
|
backdropDismiss: false
|
||||||
});
|
});
|
||||||
yield modal.present();
|
yield modal.present();
|
||||||
modal.onDidDismiss().then(res => {
|
modal.onDidDismiss();
|
||||||
if (res.data) {
|
|
||||||
console.log('go to new group');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -705,7 +796,8 @@ GroupContactsPage.ctorParameters = () => [
|
|||||||
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"] },
|
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["ModalController"] },
|
||||||
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
|
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
|
||||||
{ type: src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__["ChatService"] },
|
{ type: src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_5__["ChatService"] },
|
||||||
{ type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"] }
|
{ type: src_app_services_auth_service__WEBPACK_IMPORTED_MODULE_4__["AuthService"] },
|
||||||
|
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_3__["NavParams"] }
|
||||||
];
|
];
|
||||||
GroupContactsPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
GroupContactsPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
||||||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_2__["Component"])({
|
Object(_angular_core__WEBPACK_IMPORTED_MODULE_2__["Component"])({
|
||||||
@@ -753,7 +845,7 @@ __webpack_require__.r(__webpack_exports__);
|
|||||||
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
|
/* harmony import */ var src_app_services_chat_service__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! src/app/services/chat.service */ "./src/app/services/chat.service.ts");
|
||||||
/* harmony import */ var src_app_shared_popover_chat_options_popover_chat_options_popover_page__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/shared/popover/chat-options-popover/chat-options-popover.page */ "./src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts");
|
/* harmony import */ var src_app_shared_popover_chat_options_popover_chat_options_popover_page__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! src/app/shared/popover/chat-options-popover/chat-options-popover.page */ "./src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts");
|
||||||
/* harmony import */ var src_app_shared_popover_chat_popover_chat_popover_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! src/app/shared/popover/chat-popover/chat-popover.page */ "./src/app/shared/popover/chat-popover/chat-popover.page.ts");
|
/* harmony import */ var src_app_shared_popover_chat_popover_chat_popover_page__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! src/app/shared/popover/chat-popover/chat-popover.page */ "./src/app/shared/popover/chat-popover/chat-popover.page.ts");
|
||||||
/* harmony import */ var _new_group_contacts_contacts_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../new-group/contacts/contacts.page */ "./src/app/pages/chat/new-group/contacts/contacts.page.ts");
|
/* harmony import */ var _group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./group-contacts/group-contacts.page */ "./src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -772,6 +864,7 @@ let GroupMessagesPage = class GroupMessagesPage {
|
|||||||
this.navParams = navParams;
|
this.navParams = navParams;
|
||||||
this.authService = authService;
|
this.authService = authService;
|
||||||
this.contacts = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
|
this.contacts = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
|
||||||
|
this.isGroupCreated = true;
|
||||||
this.room = this.navParams.get('room');
|
this.room = this.navParams.get('room');
|
||||||
}
|
}
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
@@ -782,6 +875,9 @@ let GroupMessagesPage = class GroupMessagesPage {
|
|||||||
this.getGroupContacts();
|
this.getGroupContacts();
|
||||||
this.loadGroupMessages();
|
this.loadGroupMessages();
|
||||||
}
|
}
|
||||||
|
close() {
|
||||||
|
this.modalController.dismiss();
|
||||||
|
}
|
||||||
getGroupContacts() {
|
getGroupContacts() {
|
||||||
//If group is private call getGroupMembers
|
//If group is private call getGroupMembers
|
||||||
if (this.room.t === 'p') {
|
if (this.room.t === 'p') {
|
||||||
@@ -803,7 +899,8 @@ let GroupMessagesPage = class GroupMessagesPage {
|
|||||||
if (this.room.t === 'p') {
|
if (this.room.t === 'p') {
|
||||||
this.chatService.getPrivateGroupMessages(this.room._id).subscribe(res => {
|
this.chatService.getPrivateGroupMessages(this.room._id).subscribe(res => {
|
||||||
console.log(res);
|
console.log(res);
|
||||||
this.messages = res['messages'].reverse();
|
let msgOnly = res['messages'].filter(data => data.t != 'au');
|
||||||
|
this.messages = msgOnly.reverse();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
//Otherwise call getChannelMembers for públic groups
|
//Otherwise call getChannelMembers for públic groups
|
||||||
@@ -886,9 +983,13 @@ let GroupMessagesPage = class GroupMessagesPage {
|
|||||||
}
|
}
|
||||||
addContacts() {
|
addContacts() {
|
||||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||||
|
this.close();
|
||||||
const modal = yield this.modalController.create({
|
const modal = yield this.modalController.create({
|
||||||
component: _new_group_contacts_contacts_page__WEBPACK_IMPORTED_MODULE_7__["ContactsPage"],
|
component: _group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_7__["GroupContactsPage"],
|
||||||
componentProps: {},
|
componentProps: {
|
||||||
|
isCreated: this.isGroupCreated,
|
||||||
|
room: this.room,
|
||||||
|
},
|
||||||
cssClass: 'contacts',
|
cssClass: 'contacts',
|
||||||
backdropDismiss: false
|
backdropDismiss: false
|
||||||
});
|
});
|
||||||
@@ -1461,11 +1562,14 @@ __webpack_require__.r(__webpack_exports__);
|
|||||||
|
|
||||||
|
|
||||||
let NewGroupPage = class NewGroupPage {
|
let NewGroupPage = class NewGroupPage {
|
||||||
constructor(pickerController, popoverController, modalController) {
|
constructor(pickerController, popoverController, modalController, navParams) {
|
||||||
this.pickerController = pickerController;
|
this.pickerController = pickerController;
|
||||||
this.popoverController = popoverController;
|
this.popoverController = popoverController;
|
||||||
this.modalController = modalController;
|
this.modalController = modalController;
|
||||||
|
this.navParams = navParams;
|
||||||
this.selectedDuration = ['', '', ''];
|
this.selectedDuration = ['', '', ''];
|
||||||
|
this.isGroupCreated = false;
|
||||||
|
this.groupName = this.navParams.get('name');
|
||||||
}
|
}
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
}
|
}
|
||||||
@@ -1477,10 +1581,14 @@ let NewGroupPage = class NewGroupPage {
|
|||||||
}
|
}
|
||||||
addContacts() {
|
addContacts() {
|
||||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||||
this.close();
|
this.modalController.dismiss();
|
||||||
const modal = yield this.modalController.create({
|
const modal = yield this.modalController.create({
|
||||||
component: _group_messages_group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_4__["GroupContactsPage"],
|
component: _group_messages_group_contacts_group_contacts_page__WEBPACK_IMPORTED_MODULE_4__["GroupContactsPage"],
|
||||||
componentProps: {},
|
componentProps: {
|
||||||
|
isCreated: this.isGroupCreated,
|
||||||
|
name: this.groupName,
|
||||||
|
duration: '',
|
||||||
|
},
|
||||||
cssClass: 'contacts',
|
cssClass: 'contacts',
|
||||||
backdropDismiss: false
|
backdropDismiss: false
|
||||||
});
|
});
|
||||||
@@ -1618,7 +1726,8 @@ let NewGroupPage = class NewGroupPage {
|
|||||||
NewGroupPage.ctorParameters = () => [
|
NewGroupPage.ctorParameters = () => [
|
||||||
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["PickerController"] },
|
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["PickerController"] },
|
||||||
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["PopoverController"] },
|
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["PopoverController"] },
|
||||||
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["ModalController"] }
|
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["ModalController"] },
|
||||||
|
{ type: _ionic_angular__WEBPACK_IMPORTED_MODULE_2__["NavParams"] }
|
||||||
];
|
];
|
||||||
NewGroupPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
NewGroupPage = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
||||||
Object(_angular_core__WEBPACK_IMPORTED_MODULE_1__["Component"])({
|
Object(_angular_core__WEBPACK_IMPORTED_MODULE_1__["Component"])({
|
||||||
|
|||||||
+4
File diff suppressed because one or more lines are too long
+425
-246
File diff suppressed because it is too large
Load Diff
+4
File diff suppressed because one or more lines are too long
+13
@@ -165,6 +165,7 @@ let LoginPage = class LoginPage {
|
|||||||
yield alert.present();
|
yield alert.present();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
<<<<<<< HEAD
|
||||||
/* loginRocketChat(){
|
/* loginRocketChat(){
|
||||||
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
||||||
this.storageService.store(AuthConnstants.AUTH, res.data);
|
this.storageService.store(AuthConnstants.AUTH, res.data);
|
||||||
@@ -173,6 +174,18 @@ let LoginPage = class LoginPage {
|
|||||||
console.log('Network error');
|
console.log('Network error');
|
||||||
});
|
});
|
||||||
} */
|
} */
|
||||||
|
=======
|
||||||
|
loginRocketChat() {
|
||||||
|
this.authService.loginChat(this.postData).subscribe((res) => {
|
||||||
|
this.storageService.store(src_app_config_auth_constants__WEBPACK_IMPORTED_MODULE_8__["AuthConnstants"].AUTH, res.data);
|
||||||
|
console.log('Login to Rocket chat OK');
|
||||||
|
this.presentAlert('Login to Rocket chat OK');
|
||||||
|
}, (error) => {
|
||||||
|
console.log('Network error');
|
||||||
|
this.presentAlert('Network error ' + error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
>>>>>>> feature/chat
|
||||||
Login() {
|
Login() {
|
||||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
|||||||
+4
File diff suppressed because one or more lines are too long
+8
@@ -318,8 +318,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|||||||
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
||||||
this.storageService.store(AuthConnstants.AUTH, res.data);
|
this.storageService.store(AuthConnstants.AUTH, res.data);
|
||||||
console.log('Login to Rocket chat OK');
|
console.log('Login to Rocket chat OK');
|
||||||
|
<<<<<<< HEAD
|
||||||
},(error:any) =>{
|
},(error:any) =>{
|
||||||
|
=======
|
||||||
|
|
||||||
|
_this.presentAlert('Login to Rocket chat OK');
|
||||||
|
}, function (error) {
|
||||||
|
>>>>>>> feature/chat
|
||||||
console.log('Network error');
|
console.log('Network error');
|
||||||
|
|
||||||
|
_this.presentAlert('Network error ' + error);
|
||||||
});
|
});
|
||||||
} */
|
} */
|
||||||
|
|
||||||
|
|||||||
+4
File diff suppressed because one or more lines are too long
+15
@@ -150,6 +150,9 @@ let ChatService = class ChatService {
|
|||||||
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'im.messages', opts);
|
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'im.messages', opts);
|
||||||
}
|
}
|
||||||
/* GROUPS */
|
/* GROUPS */
|
||||||
|
addGroup(body) {
|
||||||
|
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.create', body, this.options);
|
||||||
|
}
|
||||||
getGroupMembers(roomId) {
|
getGroupMembers(roomId) {
|
||||||
let params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
|
let params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
|
||||||
let url = src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.members';
|
let url = src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.members';
|
||||||
@@ -201,6 +204,18 @@ let ChatService = class ChatService {
|
|||||||
deleteChannel(body) {
|
deleteChannel(body) {
|
||||||
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'channels.delete', body, this.options);
|
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'channels.delete', body, this.options);
|
||||||
}
|
}
|
||||||
|
addUserToGroup(body) {
|
||||||
|
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.invite', body, this.options);
|
||||||
|
}
|
||||||
|
getGroupInfo(roomId) {
|
||||||
|
let params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
|
||||||
|
params = params.set("roomId", roomId);
|
||||||
|
let opts = {
|
||||||
|
headers: this.headers,
|
||||||
|
params: params
|
||||||
|
};
|
||||||
|
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.info', opts);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
ChatService.ctorParameters = () => [
|
ChatService.ctorParameters = () => [
|
||||||
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
|
{ type: _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpClient"] },
|
||||||
|
|||||||
+1
-1
File diff suppressed because one or more lines are too long
+21
@@ -235,6 +235,11 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
|||||||
}
|
}
|
||||||
/* GROUPS */
|
/* GROUPS */
|
||||||
|
|
||||||
|
}, {
|
||||||
|
key: "addGroup",
|
||||||
|
value: function addGroup(body) {
|
||||||
|
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.create', body, this.options);
|
||||||
|
}
|
||||||
}, {
|
}, {
|
||||||
key: "getGroupMembers",
|
key: "getGroupMembers",
|
||||||
value: function getGroupMembers(roomId) {
|
value: function getGroupMembers(roomId) {
|
||||||
@@ -303,6 +308,22 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
|
|||||||
value: function deleteChannel(body) {
|
value: function deleteChannel(body) {
|
||||||
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'channels.delete', body, this.options);
|
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'channels.delete', body, this.options);
|
||||||
}
|
}
|
||||||
|
}, {
|
||||||
|
key: "addUserToGroup",
|
||||||
|
value: function addUserToGroup(body) {
|
||||||
|
return this.http.post(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.invite', body, this.options);
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
key: "getGroupInfo",
|
||||||
|
value: function getGroupInfo(roomId) {
|
||||||
|
var params = new _angular_common_http__WEBPACK_IMPORTED_MODULE_1__["HttpParams"]();
|
||||||
|
params = params.set("roomId", roomId);
|
||||||
|
var opts = {
|
||||||
|
headers: this.headers,
|
||||||
|
params: params
|
||||||
|
};
|
||||||
|
return this.http.get(src_environments_environment__WEBPACK_IMPORTED_MODULE_6__["environment"].apiChatUrl + 'groups.info', opts);
|
||||||
|
}
|
||||||
}]);
|
}]);
|
||||||
|
|
||||||
return ChatService;
|
return ChatService;
|
||||||
|
|||||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -635,7 +635,13 @@ __webpack_require__.r(__webpack_exports__);
|
|||||||
const environment = {
|
const environment = {
|
||||||
production: false,
|
production: false,
|
||||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
||||||
|
<<<<<<< HEAD
|
||||||
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
||||||
|
=======
|
||||||
|
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||||
|
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
|
||||||
|
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
|
||||||
|
>>>>>>> feature/chat
|
||||||
domain: 'gabinetedigital.local',
|
domain: 'gabinetedigital.local',
|
||||||
defaultuser: 'paulo.pinto',
|
defaultuser: 'paulo.pinto',
|
||||||
defaultuserpwd: 'tabteste@006'
|
defaultuserpwd: 'tabteste@006'
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -776,7 +776,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|||||||
var environment = {
|
var environment = {
|
||||||
production: false,
|
production: false,
|
||||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
||||||
|
<<<<<<< HEAD
|
||||||
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/',
|
||||||
|
=======
|
||||||
|
|
||||||
|
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||||
|
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
|
||||||
|
|
||||||
|
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
|
||||||
|
>>>>>>> feature/chat
|
||||||
domain: 'gabinetedigital.local',
|
domain: 'gabinetedigital.local',
|
||||||
defaultuser: 'paulo.pinto',
|
defaultuser: 'paulo.pinto',
|
||||||
defaultuserpwd: 'tabteste@006'
|
defaultuserpwd: 'tabteste@006'
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -165,6 +165,7 @@ let LoginPage = class LoginPage {
|
|||||||
yield alert.present();
|
yield alert.present();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
<<<<<<< HEAD
|
||||||
/* loginRocketChat(){
|
/* loginRocketChat(){
|
||||||
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
||||||
this.storageService.store(AuthConnstants.AUTH, res.data);
|
this.storageService.store(AuthConnstants.AUTH, res.data);
|
||||||
@@ -173,6 +174,18 @@ let LoginPage = class LoginPage {
|
|||||||
console.log('Network error');
|
console.log('Network error');
|
||||||
});
|
});
|
||||||
} */
|
} */
|
||||||
|
=======
|
||||||
|
loginRocketChat() {
|
||||||
|
this.authService.loginChat(this.postData).subscribe((res) => {
|
||||||
|
this.storageService.store(src_app_config_auth_constants__WEBPACK_IMPORTED_MODULE_8__["AuthConnstants"].AUTH, res.data);
|
||||||
|
console.log('Login to Rocket chat OK');
|
||||||
|
this.presentAlert('Login to Rocket chat OK');
|
||||||
|
}, (error) => {
|
||||||
|
console.log('Network error');
|
||||||
|
this.presentAlert('Network error ' + error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
>>>>>>> feature/chat
|
||||||
Login() {
|
Login() {
|
||||||
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
||||||
try {
|
try {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -318,8 +318,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|||||||
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
||||||
this.storageService.store(AuthConnstants.AUTH, res.data);
|
this.storageService.store(AuthConnstants.AUTH, res.data);
|
||||||
console.log('Login to Rocket chat OK');
|
console.log('Login to Rocket chat OK');
|
||||||
|
<<<<<<< HEAD
|
||||||
},(error:any) =>{
|
},(error:any) =>{
|
||||||
|
=======
|
||||||
|
|
||||||
|
_this.presentAlert('Login to Rocket chat OK');
|
||||||
|
}, function (error) {
|
||||||
|
>>>>>>> feature/chat
|
||||||
console.log('Network error');
|
console.log('Network error');
|
||||||
|
|
||||||
|
_this.presentAlert('Network error ' + error);
|
||||||
});
|
});
|
||||||
} */
|
} */
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -59,8 +59,11 @@ export class LoginPage implements OnInit {
|
|||||||
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
this.authService.loginChat(this.postData).subscribe((res: any) =>{
|
||||||
this.storageService.store(AuthConnstants.AUTH, res.data);
|
this.storageService.store(AuthConnstants.AUTH, res.data);
|
||||||
console.log('Login to Rocket chat OK');
|
console.log('Login to Rocket chat OK');
|
||||||
|
this.presentAlert('Login to Rocket chat OK');
|
||||||
|
|
||||||
},(error:any) =>{
|
},(error:any) =>{
|
||||||
console.log('Network error');
|
console.log('Network error');
|
||||||
|
this.presentAlert('Network error '+error);
|
||||||
});
|
});
|
||||||
} */
|
} */
|
||||||
|
|
||||||
|
|||||||
@@ -27,8 +27,7 @@ export class AuthService {
|
|||||||
|
|
||||||
public ValidatedUser:User;
|
public ValidatedUser:User;
|
||||||
|
|
||||||
async login(user: User): Promise<any> {
|
async login(user: User): Promise<boolean> {
|
||||||
/* user.BasicAuthKey = 'Basic ' + btoa(user.domainName + '\\' + user.username + ':' + user.password); //conversão em base64 das credenciais inseridas */
|
|
||||||
user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password); //conversão em base64 das credenciais inseridas
|
user.BasicAuthKey = 'Basic ' + btoa(user.username + '@' + user.domainName + ':' + user.password); //conversão em base64 das credenciais inseridas
|
||||||
|
|
||||||
const options = { headers: {'Authorization': user.BasicAuthKey }};
|
const options = { headers: {'Authorization': user.BasicAuthKey }};
|
||||||
@@ -38,10 +37,10 @@ export class AuthService {
|
|||||||
}
|
}
|
||||||
const service = environment.apiURL + "userauthentication/GetValidateAuth";
|
const service = environment.apiURL + "userauthentication/GetValidateAuth";
|
||||||
|
|
||||||
/* let result: boolean | PromiseLike<boolean>; */
|
let result: boolean | PromiseLike<boolean>;
|
||||||
let response: any;
|
let response: any;
|
||||||
|
|
||||||
/* result = await this.http.get<boolean>(service, options).toPromise(); */
|
result = await this.http.get<boolean>(service, options).toPromise();
|
||||||
response = await this.http.post<any>(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise();
|
response = await this.http.post<any>(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise();
|
||||||
/* this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).subscribe(res=>{
|
/* this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).subscribe(res=>{
|
||||||
this.storageService.store(AuthConnstants.USER, res);
|
this.storageService.store(AuthConnstants.USER, res);
|
||||||
@@ -50,12 +49,12 @@ export class AuthService {
|
|||||||
console.log(user);
|
console.log(user);
|
||||||
}); */
|
}); */
|
||||||
|
|
||||||
if (response)
|
if (result)
|
||||||
{
|
{
|
||||||
this.ValidatedUser = user;
|
this.ValidatedUser = user;
|
||||||
this.storageService.store(AuthConnstants.USER, response);
|
this.storageService.store(AuthConnstants.USER, response);
|
||||||
}
|
}
|
||||||
return response;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
logout(){
|
logout(){
|
||||||
|
|||||||
@@ -5,8 +5,9 @@
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
production: false,
|
production: false,
|
||||||
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V4/api/',
|
||||||
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
|
/* apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', */
|
||||||
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
|
apiChatUrl: 'https://www.tabularium.pt/api/v1/',
|
||||||
|
/* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */
|
||||||
domain: 'gabinetedigital.local',
|
domain: 'gabinetedigital.local',
|
||||||
defaultuser: 'paulo.pinto',
|
defaultuser: 'paulo.pinto',
|
||||||
defaultuserpwd: 'tabteste@006'
|
defaultuserpwd: 'tabteste@006'
|
||||||
|
|||||||
Reference in New Issue
Block a user