Pierre-antoine Comby cc41409f5e Merge branch 'master' into 'app_member' ... # Conflicts: # apps/member/views.py		2019-08-15 19:53:40 +00:00
..
add_members.html	place custom config of js in template	2019-08-15 21:50:53 +02:00
club_detail.html
club_form.html
club_list.html
profile_detail.html
signup.html