Merge branch 'feature/MembersOnly' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:08:59 +0000 (10:08 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:08:59 +0000 (10:08 -0400)
1  2 
.htaccess
Toolkit/Page.php
templates/template.html

diff --cc .htaccess
Simple merge
Simple merge
                          <div id="toolbox" class="small-12 columns">
                              {toolboxContent:h}
                          </div>
+                         {end:}
                      </div>
 -                    <div id="offer" class="row">
 +                    <div id="offer" class="row" flexy:if="!isHomePage">
                          <div class="small-12 medium-4 columns text-center">
                              <a href="{secureBaseURL:h}2-for--1-passport-16/"><img src="{mediaBaseURL:h}assets/interior_offer.png"></a>
                          </div>