| commit | 902a36137a96017d23fc3dde1df32a44589db937 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 16 Jun 2014 23:12:02 +0000 (17 01:12 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 16 Jun 2014 23:12:02 +0000 (17 01:12 +0200) | ||
| tree | 6705fb5849c041d6138c6dbd674a8141ab382be4 | treesnapshot (tar.gz zip) |
| parent | 19e4d5ada832c0bec8460791b41f470fc652e0a7 | commitdiff |
| parent | 3fbf0893030e71d73948c1de55677ad2e1baa255 | commitdiff |
Merge branch 'MDL-45611-27' of git://github.com/phalacee/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 |