Merge branch 'MDL-59473' of https://github.com/sytabaresa/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 02:46:39 +0000 (10:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 02:46:39 +0000 (10:46 +0800)
commit5283fa3329a5725ee4a81fc5b83f3ef955642b26
tree1dc860ef81eb4278e99ec80c5c82242b111e816e
parent13822dca0772cd36144e0464c74da060bd93c9ef
parent675b291d47f9eff3bc1aaa609b6849c42bb8d2f4
Merge branch 'MDL-59473' of https://github.com/sytabaresa/moodle