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

Merge branch 'origin-hotline' into origin-master

Conflicts:
	tests/application/modules/admin/controllers/WidgetControllerTest.php
parents db082003 b4d7390b
Branches
Tags
No related merge requests found
Pipeline #4210 passed with stage
in 35 minutes
Showing
with 366 additions and 293 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