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

Browse source

Conflicts:
	core/js/oc-dialogs.js

...

This commit is contained in:

Thomas Tanghus 2013-05-16 18:21:56 +02:00

parent 913941d894 f355d797ff

commit 4a8db293ec

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available