Merge remote-tracking branch 'origin/master'
# Conflicts: # models.py # templates/containers/card.logs.html # templates/containers/list.logs.html
This commit is contained in:
# Conflicts: # models.py # templates/containers/card.logs.html # templates/containers/list.logs.html