Invalid ul tag, should be a div
remove stray closing </a>
remove another stray closing </a>
Merge remote-tracking branch 'origin/patch-1' into mapsherpa
Merge remote-tracking branch 'origin/patch-2' into mapsherpa
Merge remote-tracking branch 'origin/patch-3' into mapsherpa

Conflicts:
	theme/snippets/footer-social-links.liquid
Merge branch 'mapsherpa' of https://github.com/mapsherpa/bootstrapify into mapsherpa