Philipp Crocoll
2ace518db9
Merge branch '1.04'
Conflicts:
src/keepass2android/ChangeLog.cs
src/keepass2android/GroupBaseActivity.cs
src/keepass2android/Properties/AndroidManifest_net.xml
src/keepass2android/Resources/values/strings.xml
2018-02-20 22:18:20 +01:00
..
2017-10-16 10:26:35 +02:00
2017-12-28 14:57:21 +01:00
2013-12-26 06:31:40 +01:00
2017-09-18 11:12:55 +02:00
2018-01-23 20:42:52 +01:00
2017-12-26 19:48:46 +01:00
2018-02-20 22:18:20 +01:00
2017-12-19 22:25:16 +01:00
2013-07-17 23:11:28 +02:00
2018-02-08 11:46:48 +01:00
2017-12-19 22:25:16 +01:00
2017-12-19 22:25:16 +01:00
2017-12-19 22:25:16 +01:00
2017-12-28 09:43:48 +01:00
2013-07-12 14:41:46 +01:00
2017-12-28 14:58:30 +01:00
2017-12-19 22:25:16 +01:00
2017-12-19 22:25:16 +01:00
2017-04-24 12:00:46 +02:00
2017-12-26 11:59:05 +01:00