Pierre-antoine Comby cc41409f5e Merge branch 'master' into 'app_member' ... # Conflicts: # apps/member/views.py		2019-08-15 19:53:40 +00:00
..
activity	Move locales to project root	2019-08-14 15:15:02 +02:00
member	Merge branch 'master' into 'app_member'	2019-08-15 19:53:40 +00:00
note	Pretty print feature	2019-08-14 16:02:43 +02:00