Merge tag 'v1.2.5' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 15 Aug 2016 20:14:50 +0000 (16:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 15 Aug 2016 20:14:50 +0000 (16:14 -0400)
commit120ecfd93992a0c209cb17fe1da052e463f2ca25
tree8c40969072acb70550ba7fb06acea9b9304d3298
parent03df1b98324968c18022ed508f5b6fd1693d381c
parent0194c73a8b0d87cf2dd4abb0a222765950eeb4de
Merge tag 'v1.2.5' into develop

commented out the dropdown, dropdown buttons, topbar scss files from the foundation scss import file that was being imported by app.scss to prevent foundation top bar styles from overriding the ubermenu styles