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

version 7.1.14

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

# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_233.php
#	library/startup.php
parents f0b81869 9d7988ea
Branches
Tags
3 merge requests!780Master,!740Master,!739Hotline master
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