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	Detail view of club: member list and history	2019-08-15 21:49:59 +02:00
club_form.html	add basic club management	2019-08-11 23:25:27 +02:00
club_list.html	Club list is now clickable	2019-08-15 21:49:32 +02:00
profile_detail.html	Add transaction history list on the user	2019-08-14 16:42:05 +02:00
signup.html	fix sign up forms	2019-08-11 17:39:05 +02:00