Merge branch 'master' of https://github.com/PhilippC/keepass2android
This commit is contained in:
		@@ -1,7 +1,7 @@
 | 
			
		||||
<?xml version="1.0" encoding="utf-8"?>
 | 
			
		||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
 | 
			
		||||
			android:versionCode="133" 
 | 
			
		||||
			android:versionName="1.07-pre6" 
 | 
			
		||||
			android:versionCode="135" 
 | 
			
		||||
			android:versionName="1.07-pre8" 
 | 
			
		||||
			package="keepass2android.keepass2android" 
 | 
			
		||||
			android:installLocation="auto">
 | 
			
		||||
	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26" />
 | 
			
		||||
 
 | 
			
		||||
@@ -24,7 +24,7 @@
 | 
			
		||||
        app:actionViewClass="android.support.v7.widget.SearchView" 
 | 
			
		||||
    />
 | 
			
		||||
  <item android:id="@+id/menu_search_dummy"
 | 
			
		||||
        android:icon="@drawable/ic_menu_search"
 | 
			
		||||
        android:icon="@drawable/ic_action_search"
 | 
			
		||||
        android:title="@string/menu_search"
 | 
			
		||||
        app:showAsAction="ifRoom"
 | 
			
		||||
  />
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user