]> source.dussan.org Git - nextcloud-server.git/commit
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)
commit962907ee6f12f20c374263d6507d3557bb053e3c
tree90e387c638e4fd697b96f0fba7f0a75ff140226c
parent4b967a941426dbc7994105208e2226524651bf6d
parentd1d47eb5eb28d9a62f3a16cc3b1be4e0136bed8b
Merge branch 'master' of git://anongit.kde.org/owncloud

Conflicts:
lib/template.php
lib/template.php