]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf815b3 ab22dfd)
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
authorFrançois KUBLER <francois@kubler.org>
Wed, 9 Mar 2011 21:46:17 +0000 (22:46 +0100)
committerFrançois KUBLER <francois@kubler.org>
Wed, 9 Mar 2011 21:46:17 +0000 (22:46 +0100)
commit7faf852561d3aca1cd1f62858d03d5b3daf888f9
treefb4fcaf5ff77085073f003f59778577373638af9tree | snapshot
parentbf815b33908394fcda4fb6cb987caaca58b20fd0commit | diff
parentab22dfde8a2b34b14c8024d68a16131fc7deefa5commit | diff
Merge branch 'refactoring' of git.kde.org:owncloud into refactoring

Conflicts:
admin/templates/index.php
templates/layout.admin.php
templates/layout.user.php

All conflicts are fixed.
admin/templates/index.php diff1 | diff2 | blob | history
templates/layout.admin.php diff1 | diff2 | blob | history
templates/layout.user.php diff1 | diff2 | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server