Merge branch 'MDL-41236-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:36:54 +0000 (08:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:36:54 +0000 (08:36 +1200)
commite0a8b60f5dc706afc42c23f239b38c3a451eafbf
tree0bb5518ca0633236e37f9b999ca5a7b491f3d4c7
parentc02045ddc4b8cd0ae3af6a7800971f84b64963c2
parentf477b698abab3cfb6f563217215655f8520b14f6
Merge branch 'MDL-41236-master' of git://github.com/phalacee/moodle
lib/editor/atto/styles.css