| commit | a775f2c96dbb00bdb2e3fa2625fcb348f9b64bb1 | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Mon, 9 Sep 2013 23:22:04 +0000 (10 11:22 +1200) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Mon, 9 Sep 2013 23:22:04 +0000 (10 11:22 +1200) | ||
| tree | 873ab27e69c0e9b46804baf40e09d9e778b6e731 | treesnapshot (tar.gz zip) |
| parent | bee0a508ef4d1ac41bcdc3d7cf0564244c8ae82e | commitdiff |
| parent | 66e2b9f8c2dde9122a7078b19de069c6051a9917 | commitdiff |
Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| mod/data/lib.php | diff1 | diff2 | blobhistory |
| mod/data/templates.php | diff1 | diff2 | blobhistory |
| mod/data/view.php | diff1 | diff2 | blobhistory |
| mod/forum/post.php | diff1 | diff2 | blobhistory |