mod/workshop/version.php · bb0bd8cb580f7ca96dae7ca7875e48481fb14eed · moodle / moodle

Apr 17, 2012
bb0bd8cb
Merge branch 'MDL-25660-workshop-calendar' of git://github.com/mudrd8mz/moodle · bb0bd8cb
Dan Poltawski authored Apr 17, 2012
```
Conflicts:
	mod/workshop/lang/en/workshop.php
	mod/workshop/version.php
    mod/workshop/db/upgrade.php
```
bb0bd8cb
Merge branch 'MDL-25660-workshop-calendar' of git://github.com/mudrd8mz/moodle
Dan Poltawski authored Apr 17, 2012
```
Conflicts:
	mod/workshop/lang/en/workshop.php
	mod/workshop/version.php
    mod/workshop/db/upgrade.php
```