• Marc Egger's avatar
    Merge branch 'master' into F11035QfqWithoutTypo3 · e6ddb478
    Marc Egger authored
    # Conflicts:
    #	extension/Classes/Core/Database/DatabaseUpdateData.php
    #	extension/Classes/Core/Helper/HelperFile.php
    #	extension/Classes/Core/Report/Link.php
    #	extension/Classes/Core/Save.php
    #	extension/Classes/Core/Store/Store.php
    #	extension/ext_emconf.php
    e6ddb478