Merge branch 'develop' into feature/reorganize
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Dec 2017 19:26:02 +0000 (14:26 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Dec 2017 19:26:02 +0000 (14:26 -0500)
commit61ccfb2edc67927078c8d5c62c9a5f8ee3a8403a
treea2ea5ca4a0aca63ff0f4b8cc3127db0613981034
parent653eaed538ce25c1441f2a40167bc3e88006c540
parente8b2ee126f0b2eded466b4eecaa08346538d79ea
Merge branch 'develop' into feature/reorganize
12 files changed:
assets/events/calendar-icon-24x24.png
assets/events/contact-icon-24x24.png
assets/events/cost-icon-24x24.png
assets/events/location-icon-24x24.png
assets/events/print-icon-24x24.png
assets/events/rss-icon-24x24.png
assets/events/search-icon-24x24.png
assets/events/tickets-icon-24x24.png
assets/events/time-icon-24x24.png
css/front.css
views/front/registrations/cart.html
views/front/registrations/checkout.html