Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source

# Conflicts:
#	lib/composer/installed.php
#	setup/licenses/community-licenses.xml
#	setup/setuputils.class.inc.php
#	sources/application/TwigBase/Controller/Controller.php

...

This commit is contained in:

Pierre Goiffon

2022-02-14 08:41:33 +01:00

parent a65c55fc48 4a67819f87

commit 6a5840ed82

416 changed files with 6638 additions and 2444 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2150

setup/licenses/community-licenses.xml

File diff suppressed because it is too large Load Diff