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-02 16:06:58 +02:00
2020-04-24 14:30:18 +02:00
2019-09-18 16:44:04 +02:00
2020-04-02 14:50:28 +02:00
2020-03-18 14:42:35 +01:00
2020-03-22 14:57:51 +01:00
2020-03-20 15:58:14 +01:00
2020-05-07 18:48:35 +02:00
2020-04-02 14:50:28 +02:00
2020-04-26 01:20:46 +02:00
2020-04-02 14:50:28 +02:00
2020-04-25 19:29:18 +02:00
2020-04-26 01:20:46 +02:00
2020-04-26 01:20:46 +02:00