Skip to content
Snippets Groups Projects
Commit 775e08e0 authored by Raghu Nayyar's avatar Raghu Nayyar
Browse files

Merge branch 'master' into core-em-to-px 

Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
parents 4687d2dd bd643c47
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1044 additions and 689 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