f5d3aed721
Conflicts: src/java/JavaFileStorage/app/app.iml src/keepass2android/CreateDatabaseActivity.cs src/keepass2android/Properties/AndroidManifest_net.xml |
||
---|---|---|
.. | ||
AndroidManifest_debug.xml | ||
AndroidManifest_light.xml | ||
AndroidManifest_net.xml | ||
AndroidManifest_nonet.xml | ||
AssemblyInfo.cs |