Merge branch 'stable' into hotline-master
Conflicts: VERSIONS library/startup.php
Showing
- VERSIONS 6 additions, 0 deletionsVERSIONS
- library/Class/Profil.php 1 addition, 1 deletionlibrary/Class/Profil.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php 1 addition, 1 deletion...ontrollers/AccueilControllerConteneurDeuxColonnesTest.php
Please register or sign in to comment