Skip to content
Snippets Groups Projects
Commit 99ab16c6 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

version 7.9.10 

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

# Conflicts:
#	VERSIONS
#	application/modules/admin/views/scripts/lieu/index.phtml
#	cosmogramme/sql/patch/patch_320.php
#	cosmogramme/sql/patch/patch_321.php
#	library/startup.php
#	tests/application/modules/opac/controllers/NoticeAjaxControllerItemsTest.php
#	tests/db/UpgradeDBTest.php
parents 28e69fd6 a024db6c
Branches
Tags
3 merge requests!2334Master,!2109Master,!2108Hotline master
Pipeline #1067 passed with stage
in 18 minutes and 6 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 776 additions and 255 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