Merge branch 'master' into 'development'

Browse source

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

...

This commit is contained in:

Isaac Brown 2018-07-24 08:34:20 -04:00

parent dd9070f85b b21d548357

commit ef5126e3b5

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 is not available