5f741f2d5f
Conflicts: src/keepass2android/Properties/AndroidManifest_net.xml |
||
---|---|---|
src | ||
.gitignore | ||
CONTRIBUTORS | ||
COPYING | ||
LICENSE |
5f741f2d5f
Conflicts: src/keepass2android/Properties/AndroidManifest_net.xml |
||
---|---|---|
src | ||
.gitignore | ||
CONTRIBUTORS | ||
COPYING | ||
LICENSE |