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

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

Conflicts:
	htdocs/.gitignore
	htdocs/categories/edit.php
parents 33f1dfd6 f1ab0d36
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 45 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