Merge branch 'MDL-59822-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 07:25:33 +0000 (15:25 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 07:25:33 +0000 (15:25 +0800)
1  2 
user/classes/participants_table.php
user/index.php

Simple merge
diff --cc user/index.php
Simple merge