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-06 08:58:39 +02:00
2020-03-27 13:50:02 +01:00
2020-04-25 15:54:29 +02:00
2020-04-13 06:01:27 +02:00
2020-05-02 02:49:27 +02:00
2020-04-27 20:25:02 +02:00
2020-04-27 04:01:30 +02:00
2020-04-26 01:20:46 +02:00
2020-04-27 20:25:02 +02:00
2020-04-25 19:29:18 +02:00
2020-04-22 03:57:19 +02:00
2020-04-27 20:25:02 +02:00
2020-04-25 19:29:18 +02:00
2020-04-25 19:29:18 +02:00
2020-04-25 19:29:18 +02:00
2020-04-25 19:29:18 +02:00
2020-05-07 18:48:35 +02:00