Merge branch 'develop' of https://github.com/KDE/ocs-fileserver into develop

Authored by ronaldv on Jun 4 2019, 7:17 AM.

Description

Merge branch 'develop' of https://github.com/KDE/ocs-fileserver into develop

Details

Committed
ronaldvJun 4 2019, 7:17 AM
Parents
R765:3dc5b33e0ba5: dls
R765:f5dba03e2f44: updated gitignore
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
f5dba03e2f44alexanderschmidt
updated gitignore 
May 24 2019