Skip to content
Snippets Groups Projects
Commit 42d22ec2 authored by Laurent's avatar Laurent
Browse files

Merge branch 'origin-dev#7832_profils_url_rewriting'

Conflicts:
	cosmogramme/php/_init.php
	library/startup.php
	tests/application/modules/admin/controllers/BibControllerTest.php
parents 450f3ec0 f161cbff
Branches
Tags 8.0.20
4 merge requests!529Hotline 6.56,!512Master,!500Hotline 6.55,!498Master
Showing
with 494 additions and 286 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment