From: Bjoern Schiessle Date: Mon, 7 Oct 2013 09:00:56 +0000 (+0200) Subject: Merge branch 'master' into remove_deleted_shares_from_db X-Git-Tag: v6.0.0alpha2~78^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4f67b7a6c34d8e4ff36540ba155c75fb8e44eb7e;p=nextcloud-server.git Merge branch 'master' into remove_deleted_shares_from_db --- 4f67b7a6c34d8e4ff36540ba155c75fb8e44eb7e