| commit | 6abf3556fd8e1c34abf6a336e1c5a0e962813d82 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 23 Jul 2013 20:28:54 +0000 (23 22:28 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 23 Jul 2013 20:28:54 +0000 (23 22:28 +0200) | ||
| tree | 671d8a8991bd4040e2c37d8b7121fb66b44ad565 | treesnapshot (tar.gz zip) |
| parent | 172dda0090d5ff8f9421e633a0b724416a7a99cc | commitdiff |
| parent | 8d223d7140e73cf9cda7141898af450a5e823166 | commitdiff |
Merge branch 'MDL-40189_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Conflicts:
theme/bootstrapbase/style/moodle.css
| theme/bootstrapbase/less/moodle/responsive.less | diff1 | diff2 | blobhistory |
| theme/bootstrapbase/style/moodle.css | diff1 | diff2 | blobhistory |