Merge tag 'v2.0.4' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 18:47:08 +0000 (14:47 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 18:47:08 +0000 (14:47 -0400)
hiding 'bars' view shortcode option from shortcodes that don't use it


Trivial merge