open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	core/js/oc-dialogs.js
remotes/origin/stable6
Thomas Tanghus 12 years ago
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

Diff Content Not Available