ynerant 395c52220f Merge branch 'master' into 'tranfer_front' ...

# Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html

2020-05-07 18:48:35 +02:00

11 KiB

Raw Blame History

View Raw