Skip to content
Snippets Groups Projects
Commit 3a78bcf8 authored by Giovannoni Laurent's avatar Giovannoni Laurent
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   core/init.php
parents 8d1d82be 31628753
No related branches found
No related tags found
No related merge requests found
Showing
with 61 additions and 334 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