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:
7594ed1
a4c3183
)
Merge branch 'MDL-47628-master' of https://github.com/sammarshallou/moodle
author
Dan Poltawski
<dan@moodle.com>
Thu, 4 Dec 2014 11:40:31 +0000
(11:40 +0000)
committer
Dan Poltawski
<dan@moodle.com>
Thu, 4 Dec 2014 12:04:07 +0000
(12:04 +0000)
Conflicts:
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
1
2
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js
patch
|
diff1
|
diff2
|
blob
|
history
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
patch
|
diff1
|
diff2
|
blob
|
history
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js
patch
|
diff1
|
diff2
|
blob
|
history
availability/yui/src/form/js/form.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-debug.js
index
1af7df2
,
ec8f025
..
61b4781
Binary files differ
diff --cc
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js
index
4733ed5
,
a175713
..
92740e7
Binary files differ
diff --cc
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form.js
index
1af7df2
,
ec8f025
..
61b4781
Binary files differ
diff --cc
availability/yui/src/form/js/form.js
Simple merge
