Index: branches/2020Q4/www/py-django-mptt/Makefile
===================================================================
--- branches/2020Q4/www/py-django-mptt/Makefile	(revision 553997)
+++ branches/2020Q4/www/py-django-mptt/Makefile	(revision 553998)
@@ -1,26 +1,26 @@
 # Created by: Carlo Strub
 # $FreeBSD$
 
 PORTNAME=	django-mptt
 PORTVERSION=	0.11.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	cs@FreeBSD.org
+MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Utilities for implementing Modified Preorder Tree Traversal in Django
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}django-js-asset>0:www/py-django-js-asset@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=		yes
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-happenings \
 			${PYTHON_PKGNAMEPREFIX}dj22-django-mptt
 
 .include <bsd.port.mk>
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 553997)
+++ branches/2020Q4	(revision 553998)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r553997