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

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

Conflicts:
	Toolkit/Events/views/eventSearchForm.html
---

533f8662324df17d664773cc2da7caeff46bd4d1
diff --cc Toolkit/Events/views/eventSearchForm.html
index 3d7d2d8,8bd3242..466c47d
--- a/Toolkit/Events/views/eventSearchForm.html
+++ b/Toolkit/Events/views/eventSearchForm.html
@@@ -15,8 -15,8 +15,7 @@@
              <div id="submitNameWrapper">
                  <input
                      type="image"
-                     src="{mediaBaseURL:h}assets/go.png"
 -                    src="<?php echo MEDIA_BASE_URL;?>assets/go.png"
--                    alt="Search Events">
++                    src="<?php echo MEDIA_BASE_URL;?>assets/go.png">
              </div>
          </form>
      </div>
@@@ -77,8 -77,8 +76,7 @@@
          <div id="submitWrapper">
            <input
              type="image"
-             src="{mediaBaseURL:h}assets/go.png"
 -            src="<?php echo MEDIA_BASE_URL;?>assets/go.png"
--            alt="Search Events">
++            src="<?php echo MEDIA_BASE_URL;?>assets/go.png">
          </div>
      </form>
  </div>