diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 10:00:12 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 10:00:12 +0100 |
| commit | 364b1cd3915ab8d33f1a63f598be3acb4bfcf86a (patch) | |
| tree | 401f02cc3a6b8d9ba28620fcd9ec6a31ef381ab7 /AUTHORS | |
| parent | bfc55fef89089fc43c6a352de860374ca3fcfd53 (diff) | |
| parent | 60489764f37a6f344fa20e361a26c7a6006f9c97 (diff) | |
| download | nextcloud-server-364b1cd3915ab8d33f1a63f598be3acb4bfcf86a.tar.gz nextcloud-server-364b1cd3915ab8d33f1a63f598be3acb4bfcf86a.zip | |
Merge branch 'master' into fixing-998-master
Conflicts:
apps/files/js/files.js
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions