[Pkg-owncloud-commits] [owncloud-client] 125/484: Merge remote-tracking branch 'origin/2.0'

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit c7bf09c3d47323026a96bc83cedde8f34e9e8acf
Merge: c80e72d c8ae54d
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed Oct 21 18:49:58 2015 +0200

    Merge remote-tracking branch 'origin/2.0'

 doc/images/client-7.png     | Bin 5865 -> 5629 bytes
 doc/navigating.rst          |  39 ++++++++++++++++++++++++++-------------
 src/gui/generalsettings.cpp |   2 +-
 src/libsync/theme.cpp       |   4 ++--
 src/libsync/theme.h         |   5 +++--
 translations/client_ja.ts   |  28 ++++++++++++++--------------
 6 files changed, 46 insertions(+), 32 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git