Skip to content
Snippets Groups Projects
Commit c4fc2f17 authored by Preexo's avatar Preexo
Browse files

Merge branch 'master' into fix_notices_warnings

# Conflicts:
#	include/utils/utils.php
parents 167ad11e b2f90568
No related branches found
No related tags found
No related merge requests found
Showing
with 141 additions and 90 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