Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

This commit is contained in:
Jerome Nadaud
2013-09-16 17:05:39 +02:00
@@ -55,7 +55,7 @@
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2">
<div id="new_version_container"></div> <div id="new_version_container"></div>
<iframe frameborder="no" src="{$new_version_url}"></iframe> <iframe frameborder="no" allowtransparency="true" src="{$new_version_url}"></iframe>
<section class="dash_news panel"> <section class="dash_news panel">
<h4><i class="icon-rss"></i> PrestaShop News</h4> <h4><i class="icon-rss"></i> PrestaShop News</h4>
</section> </section>
@@ -84,4 +84,4 @@
</section> </section>
</div> </div>
</div> </div>
</div> </div>