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

Authored by ronaldv on Dec 18 2018, 3:23 PM.

Description

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

Details

Committed
ronaldvDec 18 2018, 3:23 PM
Parents
R767:01c5a30c8e6d: dl
R767:de9629e3a530: updated remove/reactivate member
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
de9629e3a530alexanderschmidt
updated remove/reactivate member 
Dec 18 2018
84d1754f19dbdavid nelband
no message 
Dec 18 2018
c6b97245ff60david nelband
no message 
Dec 18 2018
0d9065c7e025david nelband
no message 
Dec 18 2018
901e03aff907alexanderschmidt
updated remove/reactivate member 
Dec 18 2018
99a47ec4c908alexanderschmidt
updated remove/reactivate member 
Dec 18 2018
4821a8d2c129alexanderschmidt
updated journal for deactivating members 
Dec 18 2018