Go to file
Philipp Crocoll f5d3aed721 Merge branch '1.0.0e'
Conflicts:
	src/java/JavaFileStorage/app/app.iml
	src/keepass2android/CreateDatabaseActivity.cs
	src/keepass2android/Properties/AndroidManifest_net.xml
2016-11-28 21:39:13 +01:00
src Merge branch '1.0.0e' 2016-11-28 21:39:13 +01:00
.gitignore add entries in .gitignore 2016-08-30 03:57:11 +02:00
.gitmodules started working on FTP(S) implementation using netftp and introduction of "server accounts" 2016-02-03 12:43:37 +01:00
CONTRIBUTORS initial release 0.5.0 BETA 2013-02-23 17:45:00 +01:00
COPYING Fixed bug with loading attachments from kdb 2014-01-26 05:27:27 -08:00
LICENSE Fixed bug with loading attachments from kdb 2014-01-26 05:27:27 -08:00