Commit ffbf7d12 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'develop' of git.unicaen.fr:dsi/sygal into develop

parents 3f76a6f0 642b9663
Loading
Loading
Loading
Loading
+1 −0
Changes for .gitignore: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ data/DoctrineORMModule/
ressources/Logos
upload/*
vendor/
tmp/

.~*
 No newline at end of file
+740 −117

File changed.

Preview size limit exceeded, changes collapsed.

+1421 −0

File added.

Preview size limit exceeded, changes collapsed.