diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-04 16:36:30 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-04 16:36:30 -0400 |
| commit | 05389827fd8bc70b1092dc2bae1ed0335536cf4c (patch) | |
| tree | 84dea83406b3b5d5cc0cf270a4e95875f3956300 /config | |
| parent | e24e2d0e16a360753cc0430f2ba75f903c669b14 (diff) | |
| parent | 53ae56097de2098a2ffd1a8dd1076825bc93305d (diff) | |
| download | nextcloud-server-05389827fd8bc70b1092dc2bae1ed0335536cf4c.tar.gz nextcloud-server-05389827fd8bc70b1092dc2bae1ed0335536cf4c.zip | |
Merge branch 'master' into sharing
Conflicts:
.gitignore
lib/base.php
Diffstat (limited to 'config')
| -rwxr-xr-x[-rw-r--r--] | config/.gitignore | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/config/.gitignore b/config/.gitignore index d09f42a2389..d09f42a2389 100644..100755 --- a/config/.gitignore +++ b/config/.gitignore |