Merge tag 'v2.6.3' into develop

author Laury GvR <laury@gaslightmedia.com>

Tue, 4 Oct 2016 15:06:51 +0000 (11:06 -0400)

committer Laury GvR <laury@gaslightmedia.com>

Tue, 4 Oct 2016 15:06:51 +0000 (11:06 -0400)
author Laury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:06:51 +0000 (11:06 -0400)
committer Laury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:06:51 +0000 (11:06 -0400)
diff --cc controllers/front.php
Simple merge
diff --cc setup/frontHooks.php
Simple merge
diff --cc views/front/members/list.html
Simple merge
author	Laury GvR <laury@gaslightmedia.com>
	Tue, 4 Oct 2016 15:06:51 +0000 (11:06 -0400)
committer	Laury GvR <laury@gaslightmedia.com>
	Tue, 4 Oct 2016 15:06:51 +0000 (11:06 -0400)
		1	2
controllers/front.php	patch \|	diff1 \|	diff2 \|	blob \| history
setup/frontHooks.php	patch \|	diff1 \|	diff2 \|	blob \| history
views/front/members/list.html	patch \|	diff1 \|	diff2 \|	blob \| history