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

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

merge

Conflicts:
	index.php
parents a061dd33 4a1d9370
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 874 additions and 358 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