Merge commit 'refs/merge-requests/115' of...
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115 Conflicts: apps/files/templates/index.php
Loading
Please register or sign in to comment
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115 Conflicts: apps/files/templates/index.php