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)
commitdf8f4f3b5d5ac82279859d9ae00a5a7eb1766e04
treee3dec9095c04d19daa3953b3bc52a48ba0dbfc12
parentd550fcf75477dc289369a502150e14ca0e350396
parentaefc51b25c4ac90f682c298e3e894b4858b397ba
Merge tag 'v2.0.4' into develop

hiding 'bars' view shortcode option from shortcodes that don't use it