nextcloud-talk-android/app/src
Mario Danic 493ec6ebd6 Update conflicts
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-07-14 16:25:53 +02:00
..
androidTest/java/com/nextcloud/talk Fix #14 2018-01-01 16:35:30 +01:00
generic Fix #221 2018-07-14 16:25:53 +02:00
gplay Fix #221 2018-07-14 16:25:53 +02:00
main Update conflicts 2018-07-14 16:25:53 +02:00
test/java/com/nextcloud/talk CR: new line 2018-02-22 12:34:34 +01:00