[libreoffice-online] 01/05: Merge branch 'master' into experimental

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository libreoffice-online.

commit 5cacb179fed42c4ff2c1eed0d1544b9547a64578
Merge: 24c825c cf3b638
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Nov 29 00:48:06 2017 +0100

    Merge branch 'master' into experimental

 debian/loleaflet.install |  1 +
 debian/loolwsd.cron.d    |  1 +
 debian/loolwsd.install   |  7 +++++++
 debian/loolwsd.links     |  2 ++
 debian/rules             | 17 ++++++++++++-----
 5 files changed, 23 insertions(+), 5 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git