| commit | 0591c2056d315f8445334ada4bed261ca1d3eafb | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Tue, 3 Jun 2014 21:51:37 +0000 (4 09:51 +1200) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Tue, 3 Jun 2014 21:51:37 +0000 (4 09:51 +1200) | ||
| tree | efeb95aa68debb646ebee143c50447ea35c468f6 | treesnapshot (tar.gz zip) |
| parent | 71fa28477bfa25bceffa95b8ab2147f90d5d6ec0 | commitdiff |
| parent | 72704adf0349039ecfbd2d64ac0f76a3ec89d913 | commitdiff |
Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| lang/en/moodle.php | diff1 | diff2 | blobhistory |
| lib/weblib.php | diff1 | diff2 | blobhistory |
| theme/base/style/core.css | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |