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
..
activity	Merge branch 'master' into 'tranfer_front'	2020-05-07 18:48:35 +02:00
api	List wei	2020-04-11 23:02:12 +02:00
logs	Some model translations were missing	2020-04-06 10:58:16 +02:00
member	Don't change the password of another member (+ minor fixes on WEI app)	2020-04-27 20:25:02 +02:00
note	Merge branch 'master' into 'tranfer_front'	2020-05-07 18:48:35 +02:00
permission	Merge branch 'master' into 'tranfer_front'	2020-05-07 18:48:35 +02:00
registration	Add PDF member lists	2020-04-23 18:28:16 +02:00
scripts@f0aa426950	Fix email validation, turbolinks link	2020-04-27 17:59:34 +02:00
treasury	Merge branch 'master' into 'tranfer_front'	2020-05-07 18:48:35 +02:00
wei	Don't change the password of another member (+ minor fixes on WEI app)	2020-04-27 20:25:02 +02:00