f5d3aed72122c66e0d2df3f31b7a730ecbe6f3b3

Conflicts: src/java/JavaFileStorage/app/app.iml src/keepass2android/CreateDatabaseActivity.cs src/keepass2android/Properties/AndroidManifest_net.xml
Description
Languages
C#
51.4%
Java
36.2%
C
8.1%
Assembly
2.5%
C++
1.5%
Other
0.3%