Gitlab CSE Unil

Commit 4b79d8f0 authored by M. Chardon's avatar M. Chardon
Browse files

Merge branch 'master' of gitlabriset.unil.ch:Marion.Chardon/editpdfplus

# Conflicts:
#	settings.php
parents 3ca9cb71 a2807291
......@@ -71,4 +71,4 @@ $settings->add(new admin_setting_configcolourpicker('commentplus_cartridge_color
$settings->add(new admin_setting_configtext('commentplus_cartridge_x',get_string('adminplugin_cartridge_x','assignfeedback_editpdfplus'),get_string('adminplugin_cartridge_x_desc','assignfeedback_editpdfplus'),35));
$settings->add(new admin_setting_configtext('commentplus_cartridge_y',get_string('adminplugin_cartridge_y','assignfeedback_editpdfplus'),get_string('adminplugin_cartridge_y_desc','assignfeedback_editpdfplus'),6));
//get_config("ass:::", "unsetting")
\ No newline at end of file
//get_config("ass:::", "unsetting")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment