Yohann D'ANELLO 00d560c20e Merge branch 'master' into api ... # Conflicts: # apps/note/forms.py # apps/note/urls.py # apps/note/views.py		2020-02-16 22:25:00 +01:00
..
activity	Clean code	2020-02-07 17:02:07 +01:00
api	Aliases are case insensitive	2020-02-08 23:49:39 +01:00
member	Merge branch 'master' into api	2020-02-16 22:25:00 +01:00
note	Merge branch 'master' into api	2020-02-16 22:25:00 +01:00