]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
authorFrank Karlitschek <karlitschek@kde.org>
Sat, 16 Apr 2011 16:50:49 +0000 (18:50 +0200)
committerFrank Karlitschek <karlitschek@kde.org>
Sat, 16 Apr 2011 16:50:49 +0000 (18:50 +0200)
commit150631849f5829eaf1f68517b1c81d4339a5f23b
tree6367ab3b09da151e3a83b0942b9bc93a333bcf94
parent1419b80d4eba7c57c79e46278a343db3d0a67b40
parentf0e59b9043292a5abfb0b0d21763a0cd7306dad7
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring

Conflicts:
admin/apps.php
admin/apps.php
admin/index.php
lib/base.php