Skip to content
Snippets Groups Projects
Commit 16d488b7 authored by Patrick Barroca's avatar Patrick Barroca 😁
Browse files

version 7.1.18 

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	application/modules/opac/controllers/RechercheController.php
#	library/Class/Import/Typo3.php
#	library/startup.php
#	tests/application/modules/admin/controllers/CmsControllerTest.php
#	tests/library/Class/ArticleTest.php
parents dcdeca1e 27e10901
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 402 additions and 154 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