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

Merge branch 'stable' into hotline-master

Conflicts:
	cosmogramme/sql/patch/patch_266.php
parents b10c1598 ed24f061
Branches
Tags
2 merge requests!1192Master,!1191Hotline master
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