Merge tag 'v1.1.5' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 17:47:20 +0000 (13:47 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 17:47:20 +0000 (13:47 -0400)
switching archive and categories in the blog sidebar


Trivial merge