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:
a13ee8e
46af284
)
Merge branch 'wip-MDL-40368-m26' of git://github.com/samhemelryk/moodle
author
Damyon Wiese
<damyon@moodle.com>
Tue, 9 Jul 2013 02:48:47 +0000
(10:48 +0800)
committer
Damyon Wiese
<damyon@moodle.com>
Tue, 9 Jul 2013 02:48:47 +0000
(10:48 +0800)
Conflicts:
admin/tool/capability/index.php
1
2
admin/tool/capability/index.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
admin/tool/capability/index.php
Simple merge
