peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/chat' into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-01-25 12:00:05 +01:00
parent f8db0b681b 3e3baa0f9e
commit 7e111c252b
33 changed files with 1599 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+4
View File
@@ -1,5 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
#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\\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