Yohann D'ANELLO c62b5f935a Merge remote-tracking branch 'origin/master' into beta-soon ... # Conflicts: # apps/scripts		2020-05-29 21:11:14 +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 remote-tracking branch 'origin/master' into import_nk15	2020-05-07 19:01:23 +02:00
permission	Permissions can be permanent	2020-05-07 21:14:36 +02:00
registration	Add PDF member lists	2020-04-23 18:28:16 +02:00
scripts@ee54fca89e	Merge remote-tracking branch 'origin/master' into beta-soon	2020-05-29 21:11:14 +02:00
treasury	Merge remote-tracking branch 'origin/master' into import_nk15	2020-05-07 19:01:23 +02:00
wei	move wei script to wei app	2020-05-14 15:16:10 +02:00