diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-09-14 16:25:59 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2018-09-14 16:25:59 +0300 |
| commit | 0290564d5c654d654856f04f1b04bad984f36aee (patch) | |
| tree | 3b9a5eda39861d9467bc130a00e7effbc4ef7b6c /.gitmodules | |
| parent | 638f5c8752164ccc0429b1df60b79c3d3293bcd4 (diff) | |
| parent | 3a335879fa1f00f094d82855126fec3f6ab59405 (diff) | |
Merge remote-tracking branch 'owncloud/master' into delta-sync
Conflicts:
.gitmodules
src/cmd/cmd.cpp
src/gui/generalsettings.ui
src/libsync/propagatedownload.cpp
src/libsync/propagateuploadng.cpp
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 19d0e8349..3b5db194c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "src/3rdparty/zsync"] path = src/3rdparty/zsync url = https://github.com/ahmedammar/zsync +[submodule "doc/docs-themes"] + path = doc/docs-themes + url = https://github.com/owncloud/docs-themes.git |