From: Steve Sutton Date: Fri, 20 Jun 2014 17:28:39 +0000 (-0400) Subject: Merge branch 'feature/menu' into develop X-Git-Tag: v1.0^2~29^2~1 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4438d6f54c40a3e67317e7c597b47345ff031edb;p=web%2FSooLocks.git Merge branch 'feature/menu' into develop Conflicts: Toolkit/Page.php templates/template.html --- 4438d6f54c40a3e67317e7c597b47345ff031edb diff --cc templates/template.html index 852ba30,d1008a5..544235c --- a/templates/template.html +++ b/templates/template.html @@@ -8,17 -8,9 +8,18 @@@ + {styles:h} {topScripts:h} +

@@@ -28,27 -20,10 +29,11 @@@

Soo Locks Boat Tours