commit bebf3c76dad2c2159b6ba1bcde883a1034aaf6dc Merge: 56910b6 5347545 Author: emma peel <emma.peel@riseup.net> Date: Wed Jan 15 15:48:01 2020 +0100 Merge branch 'master' into translations content/plugins/contents.lr | 2 +- content/security-settings/contents.lr | 4 ++-- lego | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)