diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-02 08:48:37 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-02 08:48:37 +0200 |
| commit | 7086c386fdd1cfcec0ddc0db19615bd4586bade3 (patch) | |
| tree | 26d7a890bc0350af5260bb7a3736610e533e6d3b /apps/files/js/filesummary.js | |
| parent | 229e3dcba86db3bd91bbddd78079bf340edff710 (diff) | |
| parent | 73dd5ff26c2d7652fd4abacbac53d734f64fde96 (diff) | |
| download | nextcloud-server-7086c386fdd1cfcec0ddc0db19615bd4586bade3.tar.gz nextcloud-server-7086c386fdd1cfcec0ddc0db19615bd4586bade3.zip | |
Merge branch 'master' into append-error-document
Conflicts:
lib/private/setup.php
lib/private/updater.php
Diffstat (limited to 'apps/files/js/filesummary.js')
0 files changed, 0 insertions, 0 deletions