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

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

Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
parents d72d6de9 81fc86ba
Branches master
No related tags found
No related merge requests found
Showing
with 51 additions and 45 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment