Merge branch 'UITesting'
Conflicts: .gitignore src/KeePass.sln src/keepass2android/EntryActivity.cs src/keepass2android/Resources/Resource.designer.cs src/keepass2android/keepass2android.csproj
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -25,3 +25,4 @@
|
||||
/src/java/KP2ASoftKeyboard/gen
|
||||
/src/java/KP2ASoftKeyboard/projectzip
|
||||
/src/java/KP2ASoftKeyboard/createProjectZip.bat
|
||||
Thumbs.db
|
||||
|
||||
Reference in New Issue
Block a user