diff options
| author | François KUBLER <francois@kubler.org> | 2011-03-09 22:46:17 +0100 |
|---|---|---|
| committer | François KUBLER <francois@kubler.org> | 2011-03-09 22:46:17 +0100 |
| commit | 7faf852561d3aca1cd1f62858d03d5b3daf888f9 (patch) | |
| tree | fb4fcaf5ff77085073f003f59778577373638af9 /3dparty | |
| parent | bf815b33908394fcda4fb6cb987caaca58b20fd0 (diff) | |
| parent | ab22dfde8a2b34b14c8024d68a16131fc7deefa5 (diff) | |
| download | nextcloud-server-7faf852561d3aca1cd1f62858d03d5b3daf888f9.tar.gz nextcloud-server-7faf852561d3aca1cd1f62858d03d5b3daf888f9.zip | |
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.
Diffstat (limited to '3dparty')
0 files changed, 0 insertions, 0 deletions