Merge tag 'v1.6.2' into develop develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 21 Jan 2019 19:00:48 +0000 (14:00 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 21 Jan 2019 19:00:48 +0000 (14:00 -0500)
commitc33147c2b938e27c96f2f8ddfdb07ebcda1796b2
tree5aacadc4320718726cb51e3c05000bb113cacf7e
parent9a512c14edf57bf20c6381d345975a2f1061a598
parentabbf03c60c4c5171e67fea587aac3c59348cb172
Merge tag 'v1.6.2' into develop

adding function to allow new shortcode attribute

new shortcode attribute that takes the name of a block to act as a category in nested blocks