Andy Scherzinger bca547621f merge conflict resolved		2016-07-09 20:45:58 +02:00
..
com/owncloud/android	merge conflict resolved	2016-07-09 20:45:58 +02:00
org/nextcloud/providers	Review fixes	2016-06-20 22:15:03 +02:00
third_parties	removed commented code	2015-08-25 15:57:10 +02:00