Merge tag 'v2.0.9' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Jun 2016 20:48:27 +0000 (16:48 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Jun 2016 20:48:27 +0000 (16:48 -0400)
commitaa1f1a5e70142cc23dcf1b6e4939926ce2fe4fe5
tree9c9cc4a288bfcaf906b11e2d9de3af912a1e40ef
parent6587456ed0f7fb14eb07f6f1abe955776a4a8367
parentcb4ede06d8b58349ed4769d25e44e1e8f8577a63
Merge tag 'v2.0.9' into develop

fixing merge conflicts with admin.css

Conflicts:
css/admin.css
classes/glmPluginSupport.php
css/admin.css