Philipp Crocoll f5d3aed721 Merge branch '1.0.0e' ... Conflicts: src/java/JavaFileStorage/app/app.iml src/keepass2android/CreateDatabaseActivity.cs src/keepass2android/Properties/AndroidManifest_net.xml		2016-11-28 21:39:13 +01:00
..
ActivityDesign.cs	fix: use normal theme for dialogs in light mode	2016-01-13 20:38:17 +01:00
LoadingDialog.cs	start implementing Xamarin.Insights based error reports	2016-01-11 20:58:42 +01:00
Util.cs	Merge branch '1.0.0e'	2016-11-28 21:39:13 +01:00