]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bd01e93 f9bf343)
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into...
authorMichael Gapczynski <GapczynskiM@gmail.com>
Wed, 13 Jun 2012 19:17:46 +0000 (15:17 -0400)
committerMichael Gapczynski <GapczynskiM@gmail.com>
Wed, 13 Jun 2012 19:17:46 +0000 (15:17 -0400)
commitb5889d6ffe2a91ccb223a84a220cb1580bc42929
treeaca675ac30746341e8ed835a9cb233cf76a7e2cctree | snapshot
parentbd01e9346941fa85b4bb96a42cecdbc50e51c368commit | diff
parentf9bf34340c7618a90f8ac3452b7d89085882cab3commit | diff
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127

Conflicts:
apps/files_external/templates/settings.php
lib/template.php
apps/files_external/templates/settings.php diff1 | diff2 | blob | history
lib/template.php diff1 | diff2 | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server