Skip to content
Commit 195b52cb authored by Qingping Hou's avatar Qingping Hou
Browse files

Merge branch 'master' of github.com:owncloud/core into issue_1776 

Conflicts:
	core/templates/layout.user.php
parents c111a3aa d713948d
Hide whitespace changes
Inline Side-by-side
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