Merge tag 'v1.0.16' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 28 Jun 2016 18:45:02 +0000 (14:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 28 Jun 2016 18:45:02 +0000 (14:45 -0400)
commit42df7d2d3ce9431775c32a5a59292f6ba8cb34cd
treeec09075285dff2d9c1866b494df57693d71ffe63
parentedf391916b76176f4eeff2cf87c2058b8e509906
parent532a44e15357588254cf11a4186358a193169d62
Merge tag 'v1.0.16' into develop

v1.0.16

Conflicts:
scss/plugins/_memberdb.scss