]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fix_for_2377
authorFlorin Peter <github@florin-peter.de>
Sat, 25 May 2013 18:37:28 +0000 (20:37 +0200)
committerFlorin Peter <github@florin-peter.de>
Sat, 25 May 2013 18:37:28 +0000 (20:37 +0200)
1  2 
lib/files/cache/cache.php
lib/util.php
tests/lib/files/cache/cache.php

Simple merge
diff --cc lib/util.php
Simple merge
Simple merge