Skip to content
Snippets Groups Projects
Commit 60e2524f authored by Marcos García de La Fuente's avatar Marcos García de La Fuente
Browse files

Merge remote-tracking branch 'upstream/develop' into better-practice 

Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/FunctionsLibTest.php
parents ceec3e92 a67d0f71
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1133 additions and 783 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment