Please sign in to comment.
Merge branch 'MDL-39338_M25' of git://github.com/lazydaisy/moodle int…
…o MOODLE_25_STABLE Conflicts: theme/bootstrapbase/style/moodle.css
- Loading branch information...
Showing with 3 additions and 6 deletions.
1 addition, 1 deletion not shown because the diff is too large. Please use a local Git client to view these changes.