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
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user