Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:53:09 +0000 (12:53 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:53:09 +0000 (12:53 +1000)
Conflicts:
lib/editor/atto/styles.css

1  2 
lib/editor/atto/styles.css

@@@ -1,7 -1,7 +1,8 @@@
  div.editor_atto {
      background-color: white;
      border: 1px solid #BBB;
 +    width: 100%;
+     padding: 4px;
  }
  
  .editor_atto + textarea {