Merge branch 'release/1.0.0'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Apr 2015 16:08:25 +0000 (12:08 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Apr 2015 16:08:25 +0000 (12:08 -0400)
commitfd542b744239fc289a26937676de56139f6bced7
treed95446dc9589bd25bbe12279180062dd2847db31
parent6d4e16bac681a67bc968bb88f2d072944614fcb8
parentf9d199f651dd01b03b339fc7c91d7c8cc620caf0
Merge branch 'release/1.0.0'

Conflicts:
single.php