Merge branch 'develop' into hosting_i18n

This commit is contained in:
modulos 2017-06-03 09:59:48 +02:00
commit 31e9377818
14 changed files with 381 additions and 298 deletions

View file

@ -235,7 +235,6 @@
<div class="col-xs-12 col-md-6 text">
<h2 class="section-heading">{% trans "We are cutting down the costs significantly!" %}</h2>
<p class="lead">{% trans "Affordable VM hosting based in Switzerland" %}</p>
<a href="#" class="btn btn-info btn-lg">{% trans "More Info" %}</a>
</div>
<div class="col-xs-12 col-md-6 hero-feature">