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

Merge branch 'stable' into hotline-master

7.11.15

Conflicts:
	VERSIONS
	cosmogramme/sql/patch/patch_339.php
	library/startup.php
parents b970a21c 51561674
Branches
Tags
1 merge request!2464Master
Pipeline #3224 passed with stage
in 28 minutes and 5 seconds
Showing
with 244 additions and 42 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