Dominik Schürmann 13a85e5702 Merge pull request #726 from mar-v-in/fix-import-from-server ... Fix import from server		2014-08-01 09:31:17 +02:00
..
src/main	Merge pull request #726 from mar-v-in/fix-import-from-server	2014-08-01 09:31:17 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Merge branch 'master' into ditch-appmsg	2014-07-26 23:06:32 +02:00