Go to file

unknown 81c4347cf1 Merge branch 'master' of 192.168.178.250:raataar/wolle-rosen-kaufen

Conflicts:
	platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
	platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
	platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
	platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
	platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
	platforms/android/.idea/workspace.xml
	platforms/android/assets/www/templates/tab-buys.html
	platforms/android/build/intermediates/assets/debug/www/templates/tab-buys.html
	platforms/android/build/intermediates/gradle_project_sync_data.bin
	platforms/android/build/intermediates/res/resources-debug.ap_
	platforms/android/build/outputs/apk/android-debug-unaligned.apk
	platforms/android/build/outputs/apk/android-debug.apk
	platforms/android/local.properties
	www/templates/tab-buys.html

2016-01-22 00:39:00 +01:00

hooks

Initial-Release

2016-01-07 21:34:26 +01:00

platforms

Merge branch 'master' of 192.168.178.250:raataar/wolle-rosen-kaufen

2016-01-22 00:39:00 +01:00

plugins

Sqlite-Plugin, DB-Copy plugin added und integriert

2016-01-15 00:59:23 +01:00

resources

Initial-Release