Merge branch 'master' into design_layout

This commit is contained in:
Alberto Garcia Cabeza
2016-01-07 16:21:00 +01:00
13 changed files with 72 additions and 151 deletions

View File

@@ -49,7 +49,7 @@
</nav>
</div>
<div class="row-full subnavigation-container"></div>
<div class="row-full subnavigation-background"></div>
<% if home_page? %>
<div class="row home-page">