LICENSE · ad0800a348a86456adb6fba602b87e273910c708 · JACQUOT Frederic / OSE · GitLab

Jan 09, 2019
558f2702
Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout · 558f2702
Alexandre Zvenigorosky authored Jan 09, 2019
```
# Conflicts:
#	composer.json
#	composer.lock
```
558f2702
Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout
Alexandre Zvenigorosky authored Jan 09, 2019
```
# Conflicts:
#	composer.json
#	composer.lock
```

This project is licensed under the CeCILL Free Software License Agreement v1.0. Learn more