Merge branch 'master' into 'development'

Browse source

# Conflicts:
#   components/active/init.js
#   components/update/class.update.php

...

This commit is contained in:

Isaac Brown 2019-05-01 10:15:42 -04:00

parent 0fc44338ae f85594a03f

commit d054139ba6

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