Merge branch 'master' into core-em-to-px (775e08e0) · Commits · github / nextcloud / server

Commit 775e08e0 authored Jan 16, 2014 by

Raghu Nayyar

Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css

Some changes are not shown.

For a faster browsing experience, only 20 of 820+ files are shown. Download one of the files below to see all changes.

Please register or to comment