Skip to content
Snippets Groups Projects
Commit 0f343a61 authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

Merge branch 'feat/22797/develop' into develop

# Conflicts:
#	composer.json
#	src/app/configuration/controllers/ConfigurationController.php
#	src/core/controllers/AuthenticationController.php
#	src/frontend/app/administration/connection/cas/cas.component.ts
#	src/frontend/app/service/auth.service.ts
#	vendor/autoload.php
#	vendor/composer/ClassLoader.php
#	vendor/composer/LICENSE
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_files.php
#	vendor/composer/autoload_namespaces.php
#	vendor/composer/autoload_psr4.php
#	vendor/composer/autoload_real.php
#	vendor/composer/autoload_static.php
#	vendor/composer/installed.json
parents be155269 8e061c05
No related branches found
No related tags found
No related merge requests found
Showing
with 1741 additions and 1364 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment