commit 0e9348ba98cc1d8e17a3f37c969be66339043cb1
Merge: 0405e7eb d4f56896
Author: gus <gus(a)torproject.org>
Date: Fri May 1 14:48:03 2020 -0400
Merge branch 'generalize-mastodon'
content/about/people/jnewsome/contents.lr | 2 +-
content/about/people/meejah/contents.lr | 2 +-
models/person.ini | 4 ++--
templates/macros/people.html | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)