Home
Documentation
Downloads
Demo
Tracker
Development
Translation
Moodle.net
Search
projects
/
moodle.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
571781f
bb76233
)
Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle
author
Eloy Lafuente (stronk7)
<stronk7@moodle.org>
Tue, 8 Oct 2013 23:48:45 +0000
(
01:48
+0200)
committer
Eloy Lafuente (stronk7)
<stronk7@moodle.org>
Tue, 8 Oct 2013 23:48:45 +0000
(
01:48
+0200)
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
1
2
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/editor/atto/yui/src/editor/js/editor.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index
1afc10f
,
85746bc
..
966612f
Binary files differ
diff --cc
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index
e3a8d70
,
c2c6d12
..
bff0fba
Binary files differ
diff --cc
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index
1afc10f
,
85746bc
..
966612f
Binary files differ
diff --cc
lib/editor/atto/yui/src/editor/js/editor.js
Simple merge
