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
..
2020-04-22 03:26:45 +02:00
2020-03-24 17:06:50 +01:00
2020-03-21 00:30:49 +01:00
2020-03-21 16:49:18 +01:00
2020-04-22 03:26:45 +02:00
2020-03-24 20:22:15 +01:00
2020-04-05 08:01:51 +02:00
2020-04-22 03:57:19 +02:00
2020-04-10 23:41:13 +02:00
2020-04-22 03:26:45 +02:00
2020-04-22 03:26:45 +02:00
2020-04-23 18:28:16 +02:00