Commit dbea6a7a authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branches 'Centres-cout' and 'master' of git.unicaen.fr:open-source/OSE into Centres-cout 

# Conflicts:
#	composer.json
#	composer.lock
parent 62058ab9

module/Application/view/application/centre-cout/index.phtml

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ while ($i < $nTblListe) { 
       href="<?= $this->url('centre-cout/saisie') ?>"

       title="Ajouter un Centre de Coûts">

        <span class="glyphicon glyphicon-edit"></span>

        Ajouter un Centre de cout</a>

        Ajouter un centre de coûts</a>



    <script type="text/javascript">

        $(function () {