Bogdan c07986d604 Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio ... # Conflicts: # safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java # safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java		2022-03-24 12:29:12 +02:00
..
java/com	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00
res	chage icon	2022-03-23 10:56:09 +02:00
AndroidManifest.xml	chage icon	2022-03-23 10:56:09 +02:00