projects / web / CityofMI.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bdf11ab a7a58e5)
Merge branch 'develop' of cvs2:web/CityofMI into develop
authorOve Klykken <ove@gaslightmedia.com>
Tue, 29 Jul 2014 20:36:07 +0000 (16:36 -0400)
committerOve Klykken <ove@gaslightmedia.com>
Tue, 29 Jul 2014 20:36:07 +0000 (16:36 -0400)
commit533f8662324df17d664773cc2da7caeff46bd4d1
tree62c9352eee75af51f88ed60f973a76b1051bab34tree | snapshot
parentbdf11ab15688d5f9931a2c2ff36934d36d48e573commit | diff
parenta7a58e552ccd1c572937c5bada230d9601c64f17commit | diff
Merge branch 'develop' of cvs2:web/CityofMI into develop

Conflicts:
Toolkit/Events/views/eventSearchForm.html
Toolkit/Events/views/eventSearchForm.html diff1 | diff2 | blob | history