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:
49ca1e7
5b9e2cc
)
Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle
author
Damyon Wiese
<damyon@moodle.com>
Tue, 14 Jan 2014 05:06:54 +0000
(13:06 +0800)
committer
Damyon Wiese
<damyon@moodle.com>
Tue, 14 Jan 2014 05:06:54 +0000
(13:06 +0800)
Conflicts:
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
course/yui/dragdrop/dragdrop.js
1
2
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-debug.js
patch
|
diff1
|
diff2
|
blob
|
history
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
patch
|
diff1
|
diff2
|
blob
|
history
course/yui/build/moodle-course-modchooser/moodle-course-modchooser.js
patch
|
diff1
|
diff2
|
blob
|
history
course/yui/src/modchooser/js/modchooser.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-debug.js
index
d3bf0c1
,
2d50c32
..
183420c
Binary files differ
diff --cc
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
index
f9bddf4
,
52b25fb
..
0425628
Binary files differ
diff --cc
course/yui/build/moodle-course-modchooser/moodle-course-modchooser.js
index
d3bf0c1
,
2d50c32
..
183420c
Binary files differ
diff --cc
course/yui/src/modchooser/js/modchooser.js
Simple merge
