Merge tag 'v1.0.2' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 25 Nov 2015 13:45:37 +0000 (08:45 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 25 Nov 2015 13:45:37 +0000 (08:45 -0500)
commit557bbb0d9185b865cedbaa3b1a66d24a71d54965
tree76cfb10d2055a44af567b5ada58c86964c05c09f
parent8166e731978e34443b64877ddd9c66ea79ed92a6
parent176719af6b07f18ca95773b956547c39ad62e79c
Merge tag 'v1.0.2' into develop

v1.0.2

Conflicts:
includes/payment-display.php
includes/payment-display.php