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

Authored by ronaldv on Mar 4 2019, 2:02 PM.

Description

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

Details

Committed
ronaldvMar 4 2019, 2:02 PM
Parents
R767:2f15b09883b3: links
R767:0ebdd1dce5df: backend: categories: DISABLE drag n drop any lines
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
0ebdd1dce5dfalexanderschmidt
backend: categories: DISABLE drag n drop any lines 
Mar 4 2019
a70fb3ab1087siyuandong
metaheader 
Mar 4 2019
fd4f69076c9csiyuandong
update 
Mar 4 2019
2aa0a2e1b49asiyuandong
update 
Mar 4 2019
b302113e6d56siyuandong
metaheader 
Mar 4 2019
df6a06554d91alexanderschmidt
logout for mastodon removed 
Mar 4 2019