Merge branch 'dev' of git.kde.org:ocs-webserver into dev

Authored by david nelband <dnelband@gmail.com> on Nov 13 2018, 12:32 PM.

Description

Merge branch 'dev' of git.kde.org:ocs-webserver into dev

  1. Conflicts:
  2. httpdocs/theme/flatui/css/stylesheet.css

Details

Committed
david nelband <dnelband@gmail.com>Nov 13 2018, 12:32 PM
Parents
R767:be328131d372: no message
R767:3fc0b9fd1a3c: dl today
Branches
Unknown
Tags
Unknown
david nelband <dnelband@gmail.com> committed R767:7f0e3e97e21c: Merge branch 'dev' of git.kde.org:ocs-webserver into dev (authored by david nelband <dnelband@gmail.com>).Nov 13 2018, 12:32 PM

Merged Changes

CommitAuthorDetailsCommitted
3fc0b9fd1a3csiyuandong
dl today 
Nov 13 2018
4e0d86b4d080siyuandong
css fix 
Nov 13 2018
7ab13053a364siyuandong
css fix 
Nov 13 2018