Merge tag 'V1.0.20' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 14:41:10 +0000 (10:41 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 14:41:10 +0000 (10:41 -0400)
commit32151ed1b2dfa74d8cf44d8da93ebc310ee4d109
treec52a1038a7992ec8c31c71cd455035d769f39543
parent32d41b29a9b126696ae05118da902aa882e08332
parent860f61375e182ceabe3e50bda4a3a42b83ecf626
Merge tag 'V1.0.20' into develop

version 1.0.20

Conflicts:
Toolkit/Members/css/member.css