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/packageDebug/tmp/debug/dex-renamer-state.txt
+4
View File
@@ -1,5 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#Wed Jan 20 13:37:00 WAT 2021
=======
#Thu Jan 21 09:26:08 WAT 2021
@@ -7,6 +8,9 @@
=======
#Wed Jan 20 15:30:14 WAT 2021
>>>>>>> feature/pushNotifications
=======
#Mon Jan 25 11:42:31 WAT 2021
>>>>>>> feature/chat
path.3=classes_1.dex
path.2=classes_0.dex
path.1=classes.dex