From: Björn Schießle Date: Wed, 12 Jun 2013 15:26:38 +0000 (+0200) Subject: Merge branch 'template_updates' of github.com:owncloud/core into template_updates X-Git-Tag: v6.0.0alpha2~640^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=63472aed3fa157bbcf3be0bf64a5646982d5a03b;p=nextcloud-server.git Merge branch 'template_updates' of github.com:owncloud/core into template_updates --- 63472aed3fa157bbcf3be0bf64a5646982d5a03b