]> source.dussan.org Git - nextcloud-server.git/commit
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into...
authorMichael Gapczynski <GapczynskiM@gmail.com>
Thu, 17 May 2012 19:38:28 +0000 (15:38 -0400)
committerMichael Gapczynski <GapczynskiM@gmail.com>
Thu, 17 May 2012 19:38:28 +0000 (15:38 -0400)
commitcbfbbe672cb4b1d03269891927edbb6059b67be9
tree924957a8bbba2e1fb4c87b1a2d8e2e67ac6e4aef
parentcf181e88bb984f728c77ad01dcbcf87f2cc4aa7a
parent6f981738bb5285d01e839ff640c163acf1b2a184
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115

Conflicts:
apps/files/templates/index.php
apps/bookmarks/templates/list.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
core/templates/login.php