merg complete

This commit is contained in:
2016-01-22 00:53:11 +01:00
parent 81c4347cf1
commit 3c5d7f9b37
193 changed files with 40 additions and 71 deletions

View File

@@ -75,4 +75,4 @@
<preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="3000" />
</widget>
<!-- From: file:/C:/Projekte/wolle-rosen-kaufen/platforms/android/res/xml/config.xml -->
<!-- From: file:/C:/Ionic/Ionic/git2/wolle-rosen-kaufen/platforms/android/res/xml/config.xml -->