diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2014-12-02 15:37:22 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2014-12-02 15:37:22 +0300 |
| commit | 3016844dd7a2889ef8a24e6e3352b060907f439d (patch) | |
| tree | 92dc48f91db231fc341aa3f4d1b7a5e3ae33d398 /README.md | |
| parent | 281c0e155348c5e1da2d08f3147107d0bc32ff9f (diff) | |
| parent | 3f5887cc0305c9d5d6824604a1aabdda4f36b727 (diff) | |
Merge branch 'master' into rename_client
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -21,8 +21,7 @@ https://github.com/owncloud/client. ## Building the source code -Please refer to doc/building.rst, or -[Building the Client](http://doc.owncloud.org/desktop/1.5/building.html) +[Building the Client](http://doc.owncloud.org/desktop/1.7/building.html) in the ownCloud Desktop Client manual. ## Maintainers and Contributors |