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:
215c370
557f44d
)
Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle
author
Eloy Lafuente (stronk7)
<stronk7@moodle.org>
Wed, 28 Jan 2015 00:02:54 +0000
(
01:02
+0100)
committer
Eloy Lafuente (stronk7)
<stronk7@moodle.org>
Wed, 28 Jan 2015 00:02:54 +0000
(
01:02
+0100)
Conflicts:
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
1
2
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-debug.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/editor/atto/plugins/undo/yui/src/button/js/button.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-debug.js
index
af09366
,
25494d4
..
1a3e43e
Binary files differ
diff --cc
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
index
c7452b2
,
7b0e9eb
..
68bbea9
Binary files differ
diff --cc
lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button.js
index
af09366
,
25494d4
..
1a3e43e
Binary files differ
diff --cc
lib/editor/atto/plugins/undo/yui/src/button/js/button.js
Simple merge
