| commit | 2c248bd416e28361b6f56bb7803b86753fef76f4 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 10 Sep 2012 20:13:36 +0000 (10 22:13 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 10 Sep 2012 20:13:36 +0000 (10 22:13 +0200) | ||
| tree | 5be886e066b9e9d470bcf39a5e55ffc1ac6b5fde | treesnapshot (tar.gz zip) |
| parent | a8cdd8758bc3d16a4944353d0858545e16789a72 | commitdiff |
| parent | 5ba3a966f60b2ead3f2ecdc8ec9fbb254d84c8ac | commitdiff |
Merge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle
Conflicts:
lib/editor/tinymce/version.php
Conflicts:
lib/editor/tinymce/version.php
| lib/editor/tinymce/version.php | diff1 | diff2 | blobhistory |