Merge branch 'MDL-60289-master' of git://github.com/lameze/moodle

This commit is contained in:
Andrew Nicols
2017-10-02 11:32:03 +08:00
3 changed files with 18512 additions and 10541 deletions
+7 -5
View File
File diff suppressed because one or more lines are too long
+18504 -10535
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -270,7 +270,7 @@
<location>amd/src/chartjs-lazy.js</location>
<name>Chart.js</name>
<license>MIT</license>
<version>2.2.2</version>
<version>2.7.0</version>
</library>
<library>
<location>maxmind/GeoIp2</location>