]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
authorJakob Sack <kde@jakobsack.de>
Fri, 29 Jul 2011 18:42:24 +0000 (20:42 +0200)
committerJakob Sack <kde@jakobsack.de>
Fri, 29 Jul 2011 18:42:24 +0000 (20:42 +0200)
commit2bfad189e7e9c8ea78e4b5f78c9e779074dd991c
tree697204517c95647e382a4723545ade3950420913
parente69079f9354464d21f31ae8b6d9e47988ba22fb4
parentd12d08e2f3553b06df6371535f971c9f193bd388
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload

Conflicts:
lib/base.php
lib/filestorage.php
apps/user_openid/phpmyid.php
lib/base.php
lib/filestorage.php
lib/filestorage/local.php
lib/util.php