Merge branch 'master' of https://github.com/kristian-94/moodle
authorSara Arjona <sara@moodle.com>
Wed, 30 Jan 2019 18:08:59 +0000 (19:08 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 30 Jan 2019 18:08:59 +0000 (19:08 +0100)
commitf59f689e29805ac7beada23f0c0453978791b2d6
tree2722986bb94b87bd8784afc6afcf1ba7e80f59e7
parentd5cd0717779be89bd311936b9cbd50d14e46bfc4
parent26a6b74d6e1dfe9a780c2c92d080bf950eb54278
Merge branch 'master' of https://github.com/kristian-94/moodle