Skip to content
Snippets Groups Projects
Commit 76528e12 authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branch 'b8.1' of https://git.unicaen.fr/open-source/OSE into types-diplome 

# Conflicts:
#	module/Application/config/administration.config.php
parents a1b4a142 9a31e9d9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 64 additions and 7 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment