conversations/gradle
steckbrief ee0264d98c Merge branch 'master' into introduce_cplus_database_version
Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	src/main/res/values/strings.xml
2016-04-18 19:58:40 +02:00
..
wrapper Merge branch 'master' into introduce_cplus_database_version 2016-04-18 19:58:40 +02:00