Commit Graph

3 Commits

Author SHA1 Message Date
Philipp Crocoll
82c8b124bd Merge branch 'master' of https://git01.codeplex.com/keepass2android into HEAD
Conflicts:
	src/java/JavaFileStorage/bin/javafilestorage.jar
2014-12-09 06:22:27 +01:00
Philipp Crocoll
97bcf753a4 + binary JavaFileStorage 2014-07-30 06:25:37 +02:00
Philipp Crocoll
d93946ed05 + first version of MasterKee plugin 2014-07-13 20:58:10 +02:00