diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
| commit | 94ce8f2168bdd9897f54ec433ad7017fb3db1cc8 (patch) | |
| tree | db031ac7fd4788be6593e258d170c8f134533e4b /tests/lib | |
| parent | 269922543eaf9e69dbf5a15fa0ba34704040b09c (diff) | |
| parent | dfae77dec1650f171d09d4bde88ab74029f6e8c7 (diff) | |
| download | nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.tar.gz nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
Diffstat (limited to 'tests/lib')
0 files changed, 0 insertions, 0 deletions