Skip to content
Snippets Groups Projects
Commit b5889d6f authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Merge commit 'refs/merge-requests/127' of... 

Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127

Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
parents bd01e934 f9bf3434
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 49 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