Skip to content
Snippets Groups Projects
Commit 15063184 authored by Frank Karlitschek's avatar Frank Karlitschek
Browse files

Merge branch 'refactoring' of git.kde.org:owncloud into refactoring 

Conflicts:
	admin/apps.php
parents 1419b80d f0e59b90
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 222 additions and 64 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment