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

version 7.1.35

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

# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_237.php
#	library/Class/Systeme/PergameService.php
#	library/Class/Users.php
#	library/startup.php
#	tests/library/Class/ModelTestCase.php
#	tests/library/Class/Systeme/PergameServiceTest.php
parents 71b43a2f 850e4182
2 merge requests!903Master,!902Hotline master
Showing
with 242 additions and 121 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