mirror of
https://github.com/moodle/moodle.git
synced 2025-04-22 08:55:15 +02:00
Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle
Conflicts: lib/editor/atto/styles.css
This commit is contained in:
commit
093a6fe77f
@ -2,6 +2,7 @@ div.editor_atto {
|
||||
background-color: white;
|
||||
border: 1px solid #BBB;
|
||||
width: 100%;
|
||||
padding: 4px;
|
||||
}
|
||||
|
||||
.editor_atto + textarea {
|
||||
|
Loading…
x
Reference in New Issue
Block a user