commit 6defd32554fedd5d2818e8f43c060e59eed455e0 Merge: c10218e2 f0d0e1dc Author: emma peel emma.peel@riseup.net Date: Fri Apr 10 10:11:07 2020 +0200

Merge remote-tracking branch 'galadran/add-djackson'

assets/static/images/people/dennisjackson.png | Bin 0 -> 45557 bytes assets/static/keys/dennisjackson.txt | 52 ++++++++++++++++++++++++++ content/about/people/djackson/contents.lr | 21 +++++++++++ 3 files changed, 73 insertions(+)