ynerant 395c52220f Merge branch 'master' into 'tranfer_front' ... # Conflicts: # apps/activity/views.py # apps/permission/backends.py # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # static/js/base.js # templates/base.html # templates/member/user_list.html		2020-05-07 18:48:35 +02:00
..
admin	Revert changes on some comments	2020-04-19 20:45:59 +02:00
autocomplete_light	add static files	2020-02-25 22:15:46 +01:00
bootstrap_datepicker_plus	Use custom inputs for date picker and amounts	2020-03-27 13:50:02 +01:00
colorfield	Add teams	2020-04-13 06:01:27 +02:00
django_tables2	add static files	2020-02-25 22:15:46 +01:00
favicon	Serperlistpopette! I forgot the favicon	2020-02-18 22:54:10 +01:00
img	Register the BDE in billings	2020-03-21 00:41:55 +01:00
js	Merge branch 'master' into 'tranfer_front'	2020-05-07 18:48:35 +02:00
polymorphic	add static files	2020-02-25 22:15:46 +01:00
rest_framework	Revert changes on some comments	2020-04-19 20:45:59 +02:00