PULL-99, MDL-25929 progresstrackedroles out. Fixed conflicts and whitespace
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jan 2011 10:55:57 +0000 (11:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jan 2011 10:55:57 +0000 (11:55 +0100)
commit29650825ade1af8a86e3aeb4019aa59cfa523fed
tree94585430ac837e52cb80dd37e6a9e9399b71a43f
parenta81d26ac36256847b8a8ce538bdc2a3532070951
parent89b4ffe61708e2466d07668c1c2e2e0898d566f4
PULL-99, MDL-25929 progresstrackedroles out. Fixed conflicts and whitespace
lib/completionlib.php
lib/db/upgrade.php
version.php