]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
authorFrank Karlitschek <karlitschek@kde.org>
Sat, 16 Apr 2011 18:35:15 +0000 (20:35 +0200)
committerFrank Karlitschek <karlitschek@kde.org>
Sat, 16 Apr 2011 18:35:15 +0000 (20:35 +0200)
1  2 
lib/base.php

diff --cc lib/base.php
Simple merge