• bmagnin's avatar
    Merge branch 'develop' of github.com:Sankore/Sankore-3.1 into develop · 9c5cbb58
    bmagnin authored
    Conflicts:
    	resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js
    	resources/library/interactivities/Ass sons.wgt/locales/fr/js/script.js
    	resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
    	resources/library/interactivities/Etudier.wgt/locales/fr/js/script.js
    9c5cbb58
Name
Last commit
Last update
..
css Loading commit data...
images Loading commit data...
locales Loading commit data...
scripts Loading commit data...
config.xml Loading commit data...
icon.svg Loading commit data...
index.html Loading commit data...