fixed merge on env

2013-04-03 00:31:48 -04:00
parent 565a2cf752 67fecd3e5e
commit 1d70509da1
76 changed files with 5521 additions and 4425 deletions
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -55,7 +55,7 @@

    <%block name="content"></%block>
    <%include file="widgets/footer.html" />
-
+    <%include file="widgets/tender.html" />
    <%block name="jsextra"></%block>
  </body>