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

Authored by David Nelband <dnelband@gmail.com> on May 17 2019, 2:45 PM.

Description

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

Details

Committed
David Nelband <dnelband@gmail.com>May 17 2019, 2:45 PM
Parents
R767:d6dfff1cdc3a: pms fix
R767:19bc02914169: video preview
Branches
Unknown
Tags
Unknown
David Nelband <dnelband@gmail.com> committed R767:7b83916ff3ea: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).May 17 2019, 2:45 PM

Merged Changes

CommitAuthorDetailsCommitted
19bc02914169ronaldv
video preview 
May 17 2019
08ac66ae9f98ronaldv
video preview 
May 17 2019
0b1d51143b5eronaldv
video preview 
May 17 2019
be3f3271c7d8ronaldv
Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev 
May 17 2019
bca2f59076cbronaldv
add table file_preview 
May 17 2019
3f53c58b2727siyuandong
header 
May 17 2019
4723403fbb60siyuandong
header 
May 17 2019