summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-10-13 15:34:40 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-10-13 15:34:40 +0200
commita49d571799566d6b0e980a6dc73e641c07cc395d (patch)
treeca5926c688f32843333b25160c5cbb5f13eea424 /lib
parentc4fcd1f282132cdea2cb97c162b2b461e022390a (diff)
downloadnextcloud-server-a49d571799566d6b0e980a6dc73e641c07cc395d.tar.gz
nextcloud-server-a49d571799566d6b0e980a6dc73e641c07cc395d.zip
fix and tidy up tests after merge conflicts
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions