# Conflicts:
#   app/view/user/perso.html

Merge branch '47-message-de-confirmation-de-la-prise-en-compte-en-cas-de-demandes-divers' into 'preprod'

Resolve "Message de confirmation de la prise en compte en cas de demandes divers"

Closes #47

See merge request !50

Merge branch '47-message-de-confirmation-de-la-prise-en-compte-en-cas-de-demandes-divers' of git.laquadrature.net:lqdn-interne/don into 47-message-de-confirmation-de-la-prise-en-compte-en-cas-de-demandes-divers

Resolve "Historique des dons et contreparties"

Closes #60

See merge request !49

Master

See merge request !41

Resolve "Edition d'une adresse"

Closes #59

See merge request !43

Merge branch '59-edition-d-une-adresse' of git.laquadrature.net:lqdn-interne/don into 59-edition-d-une-adresse