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:
73c2ae4
664c851
)
Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle
author
Dan Poltawski
<dan@moodle.com>
Tue, 6 May 2014 03:48:38 +0000
(11:48 +0800)
committer
Dan Poltawski
<dan@moodle.com>
Tue, 6 May 2014 03:48:38 +0000
(11:48 +0800)
Conflicts:
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
1
2
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/editor/atto/plugins/link/yui/src/button/js/button.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
index
49f60b1
,
a995bf2
..
851d740
Binary files differ
diff --cc
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
index
390e14c
,
14062ce
..
8b51ba9
Binary files differ
diff --cc
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
index
49f60b1
,
a995bf2
..
851d740
Binary files differ
diff --cc
lib/editor/atto/plugins/link/yui/src/button/js/button.js
Simple merge