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
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<string name="app_name">SafeMobile Dispatch</string>
|
||||
<string name="app_name_demo">SafeMobile Dispatch Demo</string>
|
||||
<string name="app_name">SafeDispatch Mobile</string>
|
||||
<string name="app_name_demo">SafeDispatch Mobile Demo</string>
|
||||
<string name="app_name_radiopod">RadioPod</string>
|
||||
<string name="app_name_radiopad">RadioPad</string>
|
||||
<string name="app_name_radiopodd">RadioPod</string>
|
||||
|
Reference in New Issue
Block a user