ynerant 46e472ed6d Merge branch 'master' into 'fix-what-i-broke' ... # Conflicts: # templates/base.html		2020-03-11 17:03:44 +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	Update translations	2020-03-11 12:05:29 +01:00
note	Merge branch 'master' into 'fix-what-i-broke'	2020-03-11 17:03:44 +01:00
registration	Multi-connexions	2020-03-09 22:23:47 +01:00
base.html	Use environment rather than hardcoding strings, closes #36	2020-03-11 13:24:48 +01:00