Skip to content
Snippets Groups Projects
Commit 240a0cc8 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'hotline-master'

Conflicts:
	tests/application/modules/admin/controllers/OuverturesControllerTest.php
parents 55fc074a a2c9133f
Branches
Tags
2 merge requests!1677Hotline master,!1669Master
Showing
with 288 additions and 225 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