Merge branch 'MDL-63094-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2018 21:53:58 +0000 (23:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2018 21:53:58 +0000 (23:53 +0200)
commit1766184e97c7c058fc73f22fe38cb26cb6b35f8b
tree58543f1f20774c0bc174a4e44a360ac460885a75
parent770fc03ef6607175f4546ab8ccef5649e0d3cdc5
parent5ab0e8aae37c0d06e2968a93154591ecc491c1b8
Merge branch 'MDL-63094-master' of git://github.com/andrewnicols/moodle
admin/tool/policy/tests/behat/consent.feature