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:
@ -11,7 +11,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="10dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="@drawable/ic_launcher"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
/>
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
|
Reference in New Issue
Block a user