| commit | 48fe93fa26e76d7b7f0791fe2b38ae503b78819f | |
| author | Dan Poltawski <dan@moodle.com> | |
| Thu, 7 Nov 2013 09:17:32 +0000 (7 17:17 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Thu, 7 Nov 2013 09:17:32 +0000 (7 17:17 +0800) | ||
| tree | 1e356a0b6121d29b5a2de2c2d6b84b9cb3eb6620 | treesnapshot (tar.gz zip) |
| parent | d1cfb36b59c36c47cc19e27c202ee91a24eca302 | commitdiff |
| parent | c544ee92f50e83c42d1e8d44beadcac6a322f102 | commitdiff |
Merge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css