Commit 35bc69f7 authored by Guinness's avatar Guinness

Merge branch 'master' into 'preprod'

# Conflicts:
#   app/view/campaign/faq.html
parents f454ced8 a899ac65