Skip to content
Commit 4a8db293 authored by Thomas Tanghus's avatar Thomas Tanghus
Browse files

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

Conflicts:
	core/js/oc-dialogs.js
parents 913941d8 f355d797
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