Merge branch 'registerActivationMethodByUserAndAdmin'
authorjoshuaruesweg <ruesweg@woltlab.com>
Mon, 29 Jun 2020 20:01:58 +0000 (22:01 +0200)
committerjoshuaruesweg <ruesweg@woltlab.com>
Mon, 29 Jun 2020 20:01:58 +0000 (22:01 +0200)

Trivial merge