Skip to content
Snippets Groups Projects
Commit 65c46a7a authored by Patrick Barroca's avatar Patrick Barroca
Browse files

version 7.5.27 

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

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_290.php
	library/startup.php
	tests/db/UpgradeDBTest.php
parents e41ccf49 d1177d86
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 572 additions and 536 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