Merge branch 'develop' into staging

This commit is contained in:
Mathieu Magnin 2017-03-02 11:20:31 +01:00
commit 1e9b52ad01
2 changed files with 2 additions and 2 deletions

View file

@ -1,2 +1,2 @@
%div.col-lg-11.col-md-11.col-sm-11.col-xs-11.main-info
.col-xs-10.main-info
Recherche dans tous les dossiers

View file

@ -1 +1 @@
.col-lg-11.col-md-11.col-sm-11.col-xs-11
.col-xs-10