]> source.dussan.org Git - nextcloud-server.git/commit
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)
commite0173303e6a3ff2048422f47db7ce3d97a70c761
treed5d735b199a23ffa5d8f7264ae9b16d86f9de562
parentb69328e1d1f0888c2541e3f0be27e534f980adb4
parentd276d21c764730a83e8a2e867e9198d6c89d3307
merge conflict fixed, settings-personal.php is no longer needed

Conflicts:
apps/files_versions/templates/settings-personal.php