Merge tag 'v1.2.6' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:42:51 +0000 (14:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:42:51 +0000 (14:42 -0400)
switching archive and categories in blog sidebar


Trivial merge