]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' of github.com:owncloud/core into issue_1776
authorQingping Hou <dave2008713@gmail.com>
Mon, 25 Feb 2013 22:16:03 +0000 (17:16 -0500)
committerQingping Hou <dave2008713@gmail.com>
Mon, 25 Feb 2013 22:16:03 +0000 (17:16 -0500)
commit195b52cb63eda3d8e3af6195058a0e1403e4dede
tree4c79947d856f136051a84171eba913b1517a3bd1
parentc111a3aa248bee2bff22318c2a3d0da32ea0e451
parentd713948d3f85a6e0a369bf1a9052ce563250e3da
Merge branch 'master' of github.com:owncloud/core into issue_1776

Conflicts:
core/templates/layout.user.php
core/templates/layout.user.php
settings/js/personal.js