Commit 29ee1b05 authored by tleb's avatar tleb

Merge branch 'master' into 'add-account-amount'

# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
parents 00c96f5b 42055b90
Pipeline #2127 passed with stage
in 36 minutes and 3 seconds