]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'template_updates' of github.com:owncloud/core into template_updates
authorBjörn Schießle <schiessle@owncloud.com>
Wed, 12 Jun 2013 15:26:38 +0000 (17:26 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Wed, 12 Jun 2013 15:26:38 +0000 (17:26 +0200)
1  2 
settings/templates/personal.php

Simple merge