| commit | e26e4b8a7b4ea734e754d6993c60cff362859fbe | |
| author | Marina Glancy <marina@moodle.com> | |
| Wed, 25 Sep 2013 02:21:37 +0000 (25 12:21 +1000) | ||
| committer | Marina Glancy <marina@moodle.com> | |
| Wed, 25 Sep 2013 02:21:37 +0000 (25 12:21 +1000) | ||
| tree | 752a6db658627bcd8f60b49d6dd8977a3476653d | treesnapshot (tar.gz zip) |
| parent | 7375d9eb1fce0a6a1238cd2a8e8cc9d9e5bc67d0 | commitdiff |
| parent | 36973d707ec6dcd86f1b4d007afad51d480dd984 | commitdiff |
Merge branch 'MDL-41713-master' of git://github.com/phalacee/moodle
Conflicts:
lib/editor/atto/styles.css
Conflicts:
lib/editor/atto/styles.css
| lib/editor/atto/styles.css | diff1 | diff2 | blobhistory |