Merge branch 'MDL-59295-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 22:53:28 +0000 (00:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 22:53:28 +0000 (00:53 +0200)
commit51fc76193d924897b0022e7ae9351f56b58d03cb
tree4e9c142f39df4873b6c62a4732b0c0876022d50c
parent1dac440f55386529c572f733a248fcca72cdff69
parent9524169a594e567890269eb56c88a9819287edcc
Merge branch 'MDL-59295-master' of git://github.com/lameze/moodle
admin/tool/lp/templates/competency_rule_config.mustache