Skip to content
Snippets Groups Projects
Commit 4e279693 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	htdocs/core/boxes/box_activity.php
parents 46a9b5ec b667400c
No related branches found
No related tags found
No related merge requests found
Showing
with 239 additions and 173 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment