11 Commits

Author SHA1 Message Date
4db1623408 BuyTab mit kaufen gefuellt. 2016-01-28 23:19:16 +01:00
Akki
248ab8cb2a Zufalls-Button 2016-01-28 22:49:10 +01:00
Akki
c237c8c1e5 gekaufte Rosen Layout an Hintergrundfarben angepasst 2016-01-28 21:39:30 +01:00
3c5d7f9b37 merg complete 2016-01-22 00:53:11 +01:00
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
d22c3ce5b1 Filedownload added 2016-01-22 00:34:27 +01:00
Akki
df472e938d Layoutanpassungen 2016-01-22 00:17:04 +01:00
Akki
30587e92e7 Neues Layout 2016-01-14 23:52:18 +01:00
5b6397ea1a Storage list in Buys 2016-01-08 01:23:49 +01:00
Akki
17c376632d Kaufliste angepasst 2016-01-08 00:12:01 +01:00
307d5a772c Initial-Release 2016-01-07 21:34:26 +01:00