Skip to content
Snippets Groups Projects
Commit 7faf8525 authored by François Kubler's avatar François Kubler
Browse files

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.
parents bf815b33 ab22dfde
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 321 additions and 30 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment