Skip to content
Commit 3f6d14be authored by Jörn Friedrich Dreyer's avatar Jörn Friedrich Dreyer
Browse files

Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core 

Conflicts:
	core/css/styles.css
parents 742f54b6 5144def9
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