Merge branch 'master' into 'development'

Browse Source

# Conflicts:
#   components/active/class.active.php
#   components/sql/class.sql.php
#   components/update/class.update.php

...

This commit is contained in:

xevidos 2020-03-30 18:27:23 +00:00

parent 38293da3cc ec2779a710

commit 844eb46baf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available