Merge branch 'MDL-50888-master' of https://github.com/lucisgit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 00:19:23 +0000 (08:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 00:19:23 +0000 (08:19 +0800)
commit8d3c33c6937722a413f03e9a13eeed3a6be05dcd
tree355ee2199d01679c04025d88d142574b63ec5f71
parenta3605942596ab8147993aff253e6da77a9c19763
parentf8927a7cde6a0e47689976f5d600b7ec31940517
Merge branch 'MDL-50888-master' of https://github.com/lucisgit/moodle
lib/antivirus/clamav/db/upgrade.php
lib/antivirus/clamav/settings.php
lib/antivirus/clamav/version.php