Merge branch 'release/1.0.22'
authorLaury GvR <laury@gaslightmedia.com>
Mon, 28 Sep 2015 16:55:36 +0000 (12:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 28 Sep 2015 16:55:36 +0000 (12:55 -0400)
commitbe734ad90282ef26ccac2e5c46138bec1f7c02c6
tree31a004d5067760ee41c7b6712e1ee5bab3840cb2
parent03847cbb2715fae7bfe5272a9198dbb3069089c9
parenta0a688a5b0fcad2d515fc6cef89ae727a8e1b787
Merge branch 'release/1.0.22'

Conflicts:
views/front/members/detail.html