diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-10-23 12:01:45 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2013-10-23 12:01:45 +0200 |
| commit | d78a80a6892bdf47388329d7d426ccab6a36cf20 (patch) | |
| tree | d993a6fecb3277f86d457e0a952aeb2dc5f9590f /COPYING-README | |
| parent | 76a195a0be5d36c090c05ce60e02466e9783fea3 (diff) | |
| parent | 2d14daf36bf6c808e55895c78b42144942b73246 (diff) | |
| download | nextcloud-server-d78a80a6892bdf47388329d7d426ccab6a36cf20.tar.gz nextcloud-server-d78a80a6892bdf47388329d7d426ccab6a36cf20.zip | |
merge master with resolved conflicts
Diffstat (limited to 'COPYING-README')
0 files changed, 0 insertions, 0 deletions