| commit | e913caab9240e012429098d064fc1f19dfb6d982 | |
| author | Marina Glancy <marina@moodle.com> | |
| Tue, 19 Aug 2014 08:51:46 +0000 (19 16:51 +0800) | ||
| committer | Marina Glancy <marina@moodle.com> | |
| Tue, 19 Aug 2014 08:51:46 +0000 (19 16:51 +0800) | ||
| tree | d1f7b866af2de9053847c6e43f44d8772f3b4b78 | treesnapshot (tar.gz zip) |
| parent | aba90198320915672dc4c072daf2d2cac0ddd104 | commitdiff |
| parent | e8e159297247e674078c822180c1b74e37ca07b0 | commitdiff |
Merge branch 'MDL-46538_master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/base/style/core.css | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/less/moodle/core.less | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |