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:
d9033c0
fbfc7d2
)
Merge branch 'wip-MDL-40343-master' of git://github.com/ds125v/moodle
author
Damyon Wiese
<damyon@moodle.com>
Wed, 29 Oct 2014 04:53:21 +0000
(12:53 +0800)
committer
Damyon Wiese
<damyon@moodle.com>
Wed, 29 Oct 2014 04:53:21 +0000
(12:53 +0800)
Conflicts:
mod/forum/styles.css
1
2
mod/forum/styles.css
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mod/forum/styles.css
Simple merge