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

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

# Conflicts:
#	VERSIONS
#	library/startup.php
parents 71e9e581 25f60636
Branches
Tags
3 merge requests!2334Master,!2102#57574 : correction orthographe des jours de la semaine,!2094Master
Pipeline #966 passed with stage
in 19 minutes and 46 seconds
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