15 Commits

Author SHA1 Message Date
Philipp Crocoll
1ecfe83706 Merge remote-tracking branch 'remotes/origin/master' into nonet 2020-11-16 10:23:52 +01:00
PhilippC
6812998c8d Update README.md 2019-10-29 19:43:41 +01:00
Philipp Crocoll
38cee50f34 Merge commit 'cc8cea00491016abea0332799e7f85072a076014' into nonet
# Resolved Conflicts:
#	src/KeePass.sln
#	src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
#	src/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj
#	src/keepass2android/Properties/AndroidManifest_nonet.xml
#	src/keepass2android/keepass2android.csproj
2019-10-21 10:42:39 +02:00
Christopher Nash
d731d55a7a Added Logo to README.md
Added the Keepass2Android Logo to README.md to give it a little more "flare" when viewing it on Github.
2018-10-04 14:28:19 -06:00
Philipp Crocoll
37867634cd Merge branch 'master' into nonet
Conflicts:
	src/keepass2android/Properties/AndroidManifest_nonet.xml
2018-06-18 13:08:07 +02:00
Robin Schneider
802e3d04b2 Fix typo in README.md 2018-03-31 22:19:37 +02:00
PhilippC
ba56ab719c Update README.md 2018-03-12 11:36:52 +01:00
PhilippC
617c053b95 Update README.md 2018-03-12 11:36:35 +01:00
PhilippC
868cff2c4c Update README.md 2018-03-12 11:36:17 +01:00
Philipp Crocoll
ff8dc76c75 Merge branch 'master' into nonet
Conflicts:
	docs/README.md
2017-12-02 14:25:37 +01:00
Sven Luijten
8677aa1bca fix link to plugin file 2017-10-25 20:11:25 +02:00
Philipp Crocoll
9716130336 remove references to libraries only required for online build, adjust build script and README 2017-10-25 06:23:53 +02:00
Philipp Crocoll
6f47163591 Add build status in README.md 2017-10-24 04:46:23 +02:00
Philipp Crocoll
80fd232417 fix links 2017-09-21 23:51:06 +02:00
Philipp Crocoll
847ccac6b7 documentation, exported from Codeplex and updated 2017-09-21 23:41:56 +02:00