Skip to content
Snippets Groups Projects
Commit 865e9d97 authored by Frédéric France's avatar Frédéric France
Browse files

Merge remote branch 'upstream/develop' into patch-15

Conflicts:
	htdocs/langs/en_US/admin.lang
parents 2cb9dd8b 81d4148f
No related branches found
No related tags found
No related merge requests found
Showing
with 313 additions and 453 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