Gitlab CSE Unil

Commit 185d8614 authored by M. Chardon's avatar M. Chardon
Browse files

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

# Conflicts:
#	amd/build/admin_panel.min.js
#	amd/src/admin_panel.js
parents adc12d1d 0ebcc4b1
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