Merge branch 'dev' of git.kde.org:ocs-webserver into dev
- Conflicts:
- httpdocs/theme/flatui/css/stylesheet.css
david nelband <dnelband@gmail.com> | Nov 13 2018, 12:32 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
3fc0b9fd1a3c | siyuandong | dl today | Nov 13 2018 | |||
4e0d86b4d080 | siyuandong | css fix | Nov 13 2018 | |||
7ab13053a364 | siyuandong | css fix | Nov 13 2018 |