]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into oc_preview
authorGeorg Ehrke <georg@ownCloud.com>
Wed, 29 May 2013 11:24:14 +0000 (13:24 +0200)
committerGeorg Ehrke <georg@ownCloud.com>
Wed, 29 May 2013 11:24:14 +0000 (13:24 +0200)
commitd8008ae421850c825ae692960a26eb25ca48b986
tree736e6d2b909bfd8eb954ca69c480b5d6a5ff5efa
parenta76360347c62642b72ebb4e6b48eb9751f0703e9
parent7c0c6bd779cb73c4fdc9993f6dc78f9dd1138a88
Merge branch 'master' into oc_preview
lib/base.php