diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-31 20:34:43 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-31 20:34:43 +0200 |
| commit | 8761242f5240319e234c9fa3020141e9791cdcfb (patch) | |
| tree | a0f2e6b080f276826cb54963e484449288587fb8 /core/js/jquery.ocdialog.js | |
| parent | 1bfe975938e96f462afe5ef5e5ebc75735767711 (diff) | |
| parent | eafb241068c9d2ca591e37580722101ea548ef88 (diff) | |
| download | nextcloud-server-8761242f5240319e234c9fa3020141e9791cdcfb.tar.gz nextcloud-server-8761242f5240319e234c9fa3020141e9791cdcfb.zip | |
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/appinfo/app.php
Diffstat (limited to 'core/js/jquery.ocdialog.js')
0 files changed, 0 insertions, 0 deletions