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
..
AlarmActivity.java	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00
GoogleMapsInfoBubble.java	change package name + apk && aab	2022-03-24 11:18:49 +02:00
HistoryActivity.java	change package name + apk && aab	2022-03-24 11:18:49 +02:00
IconContextMenu.java	change package name + apk && aab	2022-03-24 11:18:49 +02:00
LiveActivity.java	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00
MapDemo.java	change package name + apk && aab	2022-03-24 11:18:49 +02:00
MessagesActivity.java	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00
NotificationActivity.java	change package name + apk && aab	2022-03-24 11:18:49 +02:00
RadioActivity.java	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00
RecordingsActivity.java	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00
SDMobileActivity_beforeMod.java	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00
SDMobileActivity.java	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00
SetupActivity.java	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00
TabLayoutActivity.java	Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio	2022-03-24 12:29:12 +02:00