From: Ove Klykken <ove@gaslightmedia.com>
Date: Tue, 29 Jul 2014 14:00:59 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:web/CityofMI into develop
X-Git-Tag: VV1^2~51
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5a02e3f59636a0f195034c6e0da29ebbbd5929f2;p=web%2FCityofMI.git

Merge branch 'develop' of cvs2:web/CityofMI into develop

Conflicts:
	templates/template.html
---

5a02e3f59636a0f195034c6e0da29ebbbd5929f2
diff --cc templates/template.html
index dd43ba8,781ea3b..1dda3a0
--- a/templates/template.html
+++ b/templates/template.html
@@@ -85,8 -88,8 +88,7 @@@
                                          <?php $counter +=1;
                                              if ($counter <=4) {
                                          ?>
 -                                        <a href="{v[href]:h}" class="cEventItem">
 -
 +                                        <a href="{v[href]:h}" class="cEventItem clearfix">
-                                         
                                          <span class="cEventTitle">{v[header]}</span>
                                          <span class="cEventDate">{v[dates]}</span>
                                          <span class="cEventTimes" flexy:if="v[times]">{v[times]}</span>
@@@ -239,4 -242,4 +241,4 @@@
          </script>
  
      </body>
--</html>
++</html>