| commit | 8f89ca5780df1a3cbf7a7c58a969d75bf4b80e85 | |
| author | Dan Poltawski <dan@moodle.com> | |
| Tue, 21 Jan 2014 15:29:25 +0000 (21 23:29 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Tue, 21 Jan 2014 15:29:25 +0000 (21 23:29 +0800) | ||
| tree | c0b482cce7236dfe3738ae934db3935ea716c9e0 | treesnapshot (tar.gz zip) |
| parent | 32418eeee0e4dba2865b1d5d269a858560bf6ec3 | commitdiff |
| parent | b31c53a372e3a929c97d80ab5670597aacbbeb91 | commitdiff |
Merge branch 'MDL-41506-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/less/moodle/core.less | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |