ynerant 57a01c48a8 Merge branch 'master' into 'tresorerie' ... # Conflicts: # apps/note/fixtures/initial.json # templates/base.html		2020-03-25 00:30:14 +01:00
..
cas_server	Make erdnaxe be happy	2020-03-07 22:28:59 +01:00
django_filters	Improve REST API with filters	2020-03-11 11:15:03 +01:00
member	Validation/devalidation of a transaction on profile page	2020-03-17 17:48:55 +01:00
note	make the CI pass and nicer front	2020-03-25 00:03:48 +01:00
registration	fix indentation	2020-03-22 22:22:37 +01:00
treasury	Product's amounts can be negative, in case of discounts (treasurers are free to generate what invoice they want)	2020-03-24 22:01:02 +01:00
base.html	Merge branch 'master' into 'tresorerie'	2020-03-25 00:30:14 +01:00