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

version 7.3.36

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

# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_269.php
#	library/startup.php
#	tests/db/UpgradeDBTest.php
parents be7f59e7 96b611d9
Branches
Tags
Showing
with 553 additions and 383 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