-
jonas.goetze authored
Merge remote-tracking branch 'origin/develop' into 415-send-information-mail-when-a-extension-key-was-transferred # Conflicts: # extensions/ter_fe2/Classes/Controller/RegisterkeyController.php # extensions/ter_fe2/composer.json
5d306c88