Pierre-antoine Comby 99d3ba9c1a Merge branch 'master' into 'explicit>implicit' ... # Conflicts: # apps/activity/views.py		2020-04-09 22:31:54 +02:00
..
activity	Merge branch 'master' into 'explicit>implicit'	2020-04-09 22:31:54 +02:00
api	API Support (useless, but...)	2020-03-22 16:04:09 +01:00
logs	Some model translations were missing	2020-04-06 10:58:16 +02:00
member	Update mail translation	2020-04-09 22:03:26 +02:00
note	Update permission fixtures	2020-04-06 10:45:32 +02:00
permission	Some model translations were missing	2020-04-06 10:58:16 +02:00
registration	Update mail translation	2020-04-09 22:03:26 +02:00
scripts@b9fdced3c2	Refactor and comment noteView	2020-03-23 15:28:09 +01:00
treasury	Merge branch 'master' into 'explicit>implicit'	2020-04-09 22:31:54 +02:00