Axel Uhl 1e3a282461 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop ...

Conflicts:
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java

Change-Id: I829d43c85301fc7c4cdfe3ab49d1f78e39940b2e

2016-04-18 17:48:32 +02:00

..

dimens.xml

preferences are now plain Theme.AppCompat.Light.NoActionBar (with the "light" primary, primaryDark und accent color)

2016-04-01 12:48:21 +02:00

references.xml

Merge remote-tracking branch 'server/ubilabs--rcapp--bug-1267' into ubilabs--rcapp--develop

2016-04-18 17:48:32 +02:00

themes_dark.xml

new images for flag down

2016-02-16 16:38:42 +01:00

themes_light.xml

new images for flag down

2016-02-16 16:38:42 +01:00