]> source.dussan.org Git - nextcloud-server.git/commit
Fix merge conflict
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 3 Jun 2014 17:05:21 +0000 (19:05 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 3 Jun 2014 17:05:21 +0000 (19:05 +0200)
commit8ee15025f06b683673101c5604b10798c75a76ae
tree4ad77e4d973c04ea5ede80e0a640a38fa20065b1
parent2bb902d02864aa73d0985537552df4b076f5860b
Fix merge conflict
apps/files_versions/lib/versions.php