Merge branch 'master' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Jun 2015 20:39:39 +0000 (16:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Jun 2015 20:39:39 +0000 (16:39 -0400)
commit0adbcd9a6271f9387f8cd9d35e8fe8d352f63136
tree3c5b8ed870b3bc12f527e089ad28ed51085d9eb7
parentbd622b568e923c7860dcea3d441e15cf6d2f9e29
parenta93d6ac403316b7edfb711c56593ae20e06643e8
Merge branch 'master' into develop
functions.php