Merge branch 'MDL-60425-master' of git://github.com/jleyva/moodle
commit92adfa3cd266f4ee3a6d8dfcd8f976cb6bd93c73
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Oct 2018 10:51:05 +0000 (8 12:51 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Oct 2018 10:51:05 +0000 (8 12:51 +0200)
treee731c4d00b3379714220c0f8384d71cf67a50127
parentde0d3941920354143e46aa017e030878899b0efd
parentbb96ff716d30e73aa0748dd83b59395a5d28a037
Merge branch 'MDL-60425-master' of git://github.com/jleyva/moodle
lib/db/services.php
version.php