Merge branch 'hotfix/vonn' into production
Merge branch 'hotfix/vonn' into production
fix a booboo
Merge branch 'hotfix/3.6.9' into production
version conflict
the damn phone number
Merge branch 'hotfix/3.6.10' into production
the version thing again
ssl for stripe and mailchimp
Merge branch 'hotfix/3.6.10-2'
merge