Merge branch 'develop' of cvs2:web/CityofMI into develop
authorOve Klykken <ove@gaslightmedia.com>
Tue, 29 Jul 2014 14:00:59 +0000 (10:00 -0400)
committerOve Klykken <ove@gaslightmedia.com>
Tue, 29 Jul 2014 14:00:59 +0000 (10:00 -0400)
commit5a02e3f59636a0f195034c6e0da29ebbbd5929f2
tree6b944c9ca19cc15135657de2b23fe7da850af46e
parentcf1f3cad37b7e307e5d9263b4824a8ff88bc517a
parent1de1c0160e4f309ac329886c5837ab23c1ae7f45
Merge branch 'develop' of cvs2:web/CityofMI into develop

Conflicts:
templates/template.html
templates/template.html