Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle

Conflicts:
	lib/editor/atto/styles.css
This commit is contained in:
Marina Glancy 2013-09-25 12:53:09 +10:00
commit 093a6fe77f

View File

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