fixing merge conflict with admin.css
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Jun 2016 20:41:24 +0000 (16:41 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Jun 2016 20:41:24 +0000 (16:41 -0400)
commit4692f7766057c88d87c05a0b07b9070bc557b5ca
treed55c30e8a76db9f4e3217fe9c170de2b00de673f
parentba7f3d9349422a38d924b63a16406a011fab6c2c
fixing merge conflict with admin.css
css/admin.css