?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2d91456 2271f18)
Merge branch 'MDL-43824-M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE
commit6a9a7005b02a5c9f8634a69e77ddeada0bda5ed3
authorDan Poltawski <dan@moodle.com>
Tue, 12 Aug 2014 10:08:11 +0000 (12 11:08 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Aug 2014 10:08:11 +0000 (12 11:08 +0100)
treeea8de36ef5b779d04ff022074ec5c219ddfc90c4tree | snapshot (tar.gz zip)
parent2d9145638cedc6e4d19b5b1ec0d36f8509fcbb73commit | diff
parent2271f1845cf95fcd7b3843562f6eafb1529e3ff3commit | diff
Merge branch 'MDL-43824-M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/style/moodle.css diff1 |  diff2 |  blob | history
Read-only mirror of the Moodle CVS