• Tino Goratsch's avatar
    Merge tag 'v4.12.2' into develop · 788f5961
    Tino Goratsch authored
    Tagging version v4.12.2
    
    # Conflicts:
    #	ACP3/Modules/ACP3/Acp/composer.json
    #	ACP3/Modules/ACP3/Articles/composer.json
    #	ACP3/Modules/ACP3/Captcha/composer.json
    #	ACP3/Modules/ACP3/Categories/composer.json
    #	ACP3/Modules/ACP3/Comments/composer.json
    #	ACP3/Modules/ACP3/Contact/composer.json
    #	ACP3/Modules/ACP3/Emoticons/composer.json
    #	ACP3/Modules/ACP3/Errors/composer.json
    #	ACP3/Modules/ACP3/Feeds/composer.json
    #	ACP3/Modules/ACP3/Filemanager/composer.json
    #	ACP3/Modules/ACP3/Files/composer.json
    #	ACP3/Modules/ACP3/Gallery/composer.json
    #	ACP3/Modules/ACP3/Guestbook/composer.json
    #	ACP3/Modules/ACP3/Menus/composer.json
    #	ACP3/Modules/ACP3/News/composer.json
    #	ACP3/Modules/ACP3/Newsletter/composer.json
    #	ACP3/Modules/ACP3/Permissions/composer.json
    #	ACP3/Modules/ACP3/Polls/composer.json
    #	ACP3/Modules/ACP3/Search/composer.json
    #	ACP3/Modules/ACP3/Seo/composer.json
    #	ACP3/Modules/ACP3/System/composer.json
    #	ACP3/Modules/ACP3/Users/composer.json
    #	ACP3/Modules/ACP3/Wysiwygckeditor/composer.json
    #	ACP3/Modules/ACP3/Wysiwygtinymce/composer.json
    #	installation/composer.json
    788f5961
Analyzing file…
composer.json 813 Bytes