diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2014-11-12 01:53:38 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2014-11-12 01:53:38 +0300 |
| commit | cdac8d56d5bde3dcd4265603998293261804f7bb (patch) | |
| tree | aed5da63cd8e1303e3d801b8944d6f51fb23b6c9 /.gitmodules | |
| parent | 7ad557f2f8d614e2fd53f26e483d337c0a789da4 (diff) | |
| parent | 7b4be209aaefe289f96db0b492414cbad1e6dfea (diff) | |
Merge remote-tracking branch 'origin/master' into crashreporter
Conflicts:
src/libsync/utility.cpp
src/libsync/utility.h
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index ba3b7388b..b51a5f87a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/owncloud/documentation [submodule "src/3rdparty/qtmacgoodies"] path = src/3rdparty/qtmacgoodies - url = git://github.com/guruz/qtmacgoodies.git + url = git://github.com/shadone/qtmacgoodies.git [submodule "binary"] path = binary url = git://github.com/owncloud/owncloud-client-binary.git |