Eric Espie
|
649674c786
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# application/twigextension.class.inc.php
# datamodels/2.x/authent-cas/composer.json
# datamodels/2.x/authent-cas/composer.lock
# datamodels/2.x/authent-cas/main.php
# datamodels/2.x/authent-cas/vendor/apereo/phpcas/composer.json
# datamodels/2.x/authent-cas/vendor/composer/ClassLoader.php
# datamodels/2.x/authent-cas/vendor/composer/autoload_classmap.php
# datamodels/2.x/authent-cas/vendor/composer/autoload_psr4.php
# datamodels/2.x/authent-cas/vendor/composer/autoload_real.php
# datamodels/2.x/authent-cas/vendor/composer/autoload_static.php
# datamodels/2.x/authent-cas/vendor/composer/installed.json
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# lib/apereo/phpcas/source/CAS.php
# lib/apereo/phpcas/source/CAS/Client.php
# lib/apereo/phpcas/source/CAS/Languages/Galego.php
# lib/apereo/phpcas/source/CAS/Languages/Portuguese.php
# lib/symfony/cache-contracts/InstalledVersions.php
# lib/symfony/cache-contracts/installed.php
# lib/symfony/cache-contracts/platform_check.php
# sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
# sources/application/TwigBase/Twig/Extension.php
|
2022-11-24 13:17:09 +01:00 |
|