Merge branch 'MDL-60046-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 17:10:52 +0000 (19:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 17:10:52 +0000 (19:10 +0200)
commitae2f169a08d31910a14b93d62167630ba273f984
treee7f98f5ff40d72a9036e3859514d316b4be8c97c
parent011c5ae476d65532ec3578800c5d24ef1603ab0f
parent1bf6dcc507447ce09b4251661a98acc59d4c23ad
Merge branch 'MDL-60046-master' of git://github.com/damyon/moodle
user/templates/unified_filter.mustache