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

Authored by ronaldv on Jan 16 2019, 10:32 AM.

Description

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

Details

Committed
ronaldvJan 16 2019, 10:32 AM
Parents
R767:bbab68a7eea5: X-Frame-Options
R767:25b2cec777f6: header logo fix
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
25b2cec777f6david nelband
header logo fix 
Jan 16 2019
907fea0d8222david nelband
Merge branch 'dev' of git.kde.org:ocs-webserver into dev 
Jan 16 2019
4ece3c0f595adavid nelband
metaheader hb menu fix & themes & apps -> store listing umbenennen 
Jan 16 2019
63a21318d4dasiyuandong
#731 
Jan 16 2019
0e214f97c6b1david nelband
metaheader 
Jan 16 2019
0cd0ca2f40c5david nelband
add timeout to click of mobile left menu close 
Jan 16 2019