| commit | 39259ea58b221c0df19466885719ae333ba63f71 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 12 Aug 2014 22:26:16 +0000 (13 00:26 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 12 Aug 2014 22:26:16 +0000 (13 00:26 +0200) | ||
| tree | 40d1c315174dacadc884cb278fa028075ff52785 | treesnapshot (tar.gz zip) |
| parent | 3ce36f6ac1c87655e1bda8e047751a281dbc4962 | commitdiff |
| parent | ef494edcd69aebcd0cc802e4245aeed7b7831dcb | commitdiff |
Merge branch 'wip-MDL-46470-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |