diff options
author | Robin Appelman <icewind@owncloud.com> | 2013-05-31 16:35:51 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2013-05-31 16:35:51 +0200 |
commit | 542bcf915680fb9942057dc0c3c9f7b0eb59f3a5 (patch) | |
tree | ebdf2628928482737d00e2654cc3ff5a044075f0 /COPYING-README | |
parent | 8320f41dbe463020423c3fe8d2368bc8d415750a (diff) | |
parent | d636e168a6c043ddae730f7cdaaee772b1067793 (diff) | |
download | nextcloud-server-542bcf915680fb9942057dc0c3c9f7b0eb59f3a5.tar.gz nextcloud-server-542bcf915680fb9942057dc0c3c9f7b0eb59f3a5.zip |
Merge branch 'master' into user
Diffstat (limited to 'COPYING-README')
0 files changed, 0 insertions, 0 deletions