| commit | e58af1dfcdc2d88c0255c2554e924c674db9d0d6 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 27 May 2013 23:24:58 +0000 (28 01:24 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 27 May 2013 23:24:58 +0000 (28 01:24 +0200) | ||
| tree | c9dc46c761687dcbfc985e7c527fa68f0997d5a5 | treesnapshot (tar.gz zip) |
| parent | 4f0d6118ffc39f3eca143ef2c3665da2d8b40781 | commitdiff |
| parent | 69ecf8c0a95868da40ed1f3b92f34feaded991e0 | commitdiff |
Merge branch 'wip-MDL-39836_M25' of git://github.com/gjb2048/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 |