Merge branch 'MDL-47866-master' of git://github.com/andrewnicols/moodle

Conflicts:
	version.php
This commit is contained in:
Dan Poltawski
2014-10-24 14:34:09 +01:00
3 changed files with 5 additions and 3 deletions
+3 -1
View File
@@ -426,8 +426,10 @@
*/
.path-grade-report {
.gradeparent {
tr .cell {
table {
.border-radius(@baseBorderRadius);
}
tr .cell {
background-color: @paginationBackground;
}
table,
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2014102400.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2014102400.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.