diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-03 04:43:11 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-03 04:43:11 +0200 |
| commit | 65413a95dcffee0d803dd30c9cd0028eb9c113e5 (patch) | |
| tree | 5e51e6da3aa76f69c0045fe5ed6b2b20f7226a1f /apps/files/lib | |
| parent | e7e3f1b81a5026116ef0c9cd95a00fdd7ff6f5a2 (diff) | |
| parent | 431cf06e996dad7af99b4c65678e5793bd682850 (diff) | |
| download | nextcloud-server-65413a95dcffee0d803dd30c9cd0028eb9c113e5.tar.gz nextcloud-server-65413a95dcffee0d803dd30c9cd0028eb9c113e5.zip | |
Merge branch 'master' into oc_avatars
Conflicts:
config/config.sample.php
Diffstat (limited to 'apps/files/lib')
0 files changed, 0 insertions, 0 deletions