src/main/java/de/upb/fsmi/fsdroid/sync/synchronizators/MeetingSynchronizator.java · d5e070c65b3703155161e8299bb4cedeeb429f85 · fsarbeit.imt / Fachschaftsdroide

Status and meeting date are displayed again. · d5e070c6

Jan Lippert authored Mar 04, 2014

Merge branch 'master' into develop

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	src/main/java/de/upb/fsmi/fsdroid/db/DatabaseHelper.java
	src/main/java/de/upb/fsmi/fsdroid/sync/FSDroidContentProvider.java

d5e070c6