Skip to content
Commit 63472aed authored by Björn Schießle's avatar Björn Schießle
Browse files

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

parents 2141c41d f565e4c2
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