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:
1331241
0860dd7
)
Merge branch 'MDL-43886-master' of git://github.com/andrewnicols/moodle
author
Sam Hemelryk
<sam@moodle.com>
Mon, 3 Feb 2014 22:14:11 +0000
(11:14 +1300)
committer
Sam Hemelryk
<sam@moodle.com>
Mon, 3 Feb 2014 22:14:11 +0000
(11:14 +1300)
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
1
2
lib/upgrade.txt
patch
|
diff1
|
diff2
|
blob
|
history
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
patch
|
diff1
|
diff2
|
blob
|
history
lib/yui/src/notification/js/dialogue.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/upgrade.txt
Simple merge
diff --cc
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
index
2e691ac
,
4af17dc
..
2e4bc5d
Binary files differ
diff --cc
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
index
138747b
,
830b6cf
..
313aa1c
Binary files differ
diff --cc
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
index
cf96f86
,
fa383fa
..
27a544a
Binary files differ
diff --cc
lib/yui/src/notification/js/dialogue.js
Simple merge