cpfeiffer 5607b1c892 Working merging of activity data, with (indeterminate) progress dialog		2016-06-19 00:10:47 +02:00
..
src	Working merging of activity data, with (indeterminate) progress dialog	2016-06-19 00:10:47 +02:00
build.gradle	Merge remote-tracking branch 'origin/master' into db-refactoring	2016-06-14 20:14:04 +02:00
proguard-rules.pro	…