Skip to content
Snippets Groups Projects
Commit cd25f423 authored by Laurent's avatar Laurent
Browse files

Merge branch 'stable'

Conflicts:
	VERSIONS
	library/startup.php
parents 2d327813 ab131c11
Branches
Tags
1 merge request!2409Master
Showing
with 427 additions and 99 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