diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2013-05-16 18:21:56 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2013-05-16 18:21:56 +0200 |
| commit | 4a8db293ececca68207761ee5e9c8323cf686bda (patch) | |
| tree | f1beb3edf32b8eb372079055d889fa5cca95c470 | |
| parent | 913941d894579ed332169a7573654fd6b0ca9eca (diff) | |
| parent | f355d797ff1dc5f92d09acbee48f3d6ff9fb4ecc (diff) | |
| download | nextcloud-server-4a8db293ececca68207761ee5e9c8323cf686bda.tar.gz nextcloud-server-4a8db293ececca68207761ee5e9c8323cf686bda.zip | |
Merge branch 'oc_dialogs_oc_template' of github.com:owncloud/core into oc_dialogs_oc_template
Conflicts:
core/js/oc-dialogs.js
0 files changed, 0 insertions, 0 deletions