]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f867ab b6ad416)
Merge branch 'master' of git://anongit.kde.org/owncloud
authorMichael Gapczynski <GapczynskiM@gmail.com>
Fri, 29 Jul 2011 16:26:30 +0000 (12:26 -0400)
committerMichael Gapczynski <GapczynskiM@gmail.com>
Fri, 29 Jul 2011 16:26:30 +0000 (12:26 -0400)
1  2 
core/templates/layout.user.php patch | diff1 | diff2 | blob | history

diff --cc core/templates/layout.user.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server