Merge branch 'master' of git.laquadrature.net:la-quadrature-du-net/controle-tes-donnees-net
Conflicts: index.html
css/bootstrap.min.css
0 → 100644
This diff is collapsed.
This diff is collapsed.
js/bootstrap.min.js
0 → 100644
This diff is collapsed.
js/jquery-2.1.4.js
0 → 100644
This diff is collapsed.
js/main.js
deleted
100644 → 0
Please register or sign in to comment