Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Authored by David Nelband <dnelband@gmail.com> on May 22 2019, 5:15 PM.

Description

Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Details

Committed
David Nelband <dnelband@gmail.com>May 22 2019, 5:15 PM
Parents
R767:c9735b231567: pms fix
R767:cb716459ad6a: osuser
Branches
Unknown
Tags
Unknown
David Nelband <dnelband@gmail.com> committed R767:16233684b79f: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).May 22 2019, 5:15 PM

Merged Changes

CommitAuthorDetailsCommitted
cb716459ad6asiyuandong
osuser 
May 22 2019
9c453df95030siyuandong
osuser 
May 22 2019
e658ef60e5c9siyuandong
settings 
May 22 2019
6c06f15f2a68ronaldv
login: check checkbox 
May 22 2019