diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-06-04 23:02:05 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-06-04 23:02:05 +0200 |
| commit | 4a5973662c78eb5769e7b06d7d559572f57e663f (patch) | |
| tree | 774e2f775b3789f5f40bd2459ddec05df1b73c31 /COPYING-README | |
| parent | 786325a4bb976d92de54c472c2c3bd8a73cbef22 (diff) | |
| parent | 3fee3a4633e5d4d65f7eabf2d387e209efedbc70 (diff) | |
| download | nextcloud-server-4a5973662c78eb5769e7b06d7d559572f57e663f.tar.gz nextcloud-server-4a5973662c78eb5769e7b06d7d559572f57e663f.zip | |
Merge branch 'unstable'
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
Diffstat (limited to 'COPYING-README')
0 files changed, 0 insertions, 0 deletions