]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into clean_up_util
authorkondou <kondou@ts.unde.re>
Mon, 2 Sep 2013 05:58:06 +0000 (07:58 +0200)
committerkondou <kondou@ts.unde.re>
Mon, 2 Sep 2013 05:58:06 +0000 (07:58 +0200)
commite5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3
treeb7d8d913cdf7f4d1ce42f3027918ad0f5fbe5c3b
parent8dd93c8c0288a11f04816bea2a58aee661ef9e97
parentf038cb9aea7c9a1513ab14d0df002773b17d5333
Merge branch 'master' into clean_up_util

Conflicts:
lib/base.php
lib/app.php
lib/base.php
lib/public/share.php
lib/util.php