]> source.dussan.org Git - nextcloud-server.git/commitdiff
merge conflict fixed, settings-personal.php is no longer needed
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 14 Jan 2013 09:24:40 +0000 (10:24 +0100)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 14 Jan 2013 09:24:40 +0000 (10:24 +0100)
Conflicts:
apps/files_versions/templates/settings-personal.php


Trivial merge