]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b967a9 d1d47eb)
Merge branch 'master' of git://anongit.kde.org/owncloud
authorJakob Sack <kde@jakobsack.de>
Mon, 8 Aug 2011 21:16:30 +0000 (23:16 +0200)
committerJakob Sack <kde@jakobsack.de>
Mon, 8 Aug 2011 21:16:30 +0000 (23:16 +0200)
Conflicts:
lib/template.php

1  2 
lib/template.php patch | diff1 | diff2 | blob | history

diff --cc lib/template.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server