| commit | 3dfb63df12e161ac2972eec76d3498a7eee0f595 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 20 Jan 2014 23:21:58 +0000 (21 00:21 +0100) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 20 Jan 2014 23:21:58 +0000 (21 00:21 +0100) | ||
| tree | 03869786acec975e1cc9fe917522d30696331751 | treesnapshot (tar.gz zip) |
| parent | 9a0d6896d0c50b333f00b5554bc2aefb7de0c63f | commitdiff |
| parent | 5b5ee3320ab0cf58c274d67e2c64d084ee0a4bf1 | commitdiff |
Merge branch 'MDL-39684-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |