Yohann D'ANELLO 8434c0062c Merge branch 'beta' into JS_translations ... # Conflicts: # apps/note/static/note/js/consos.js # locale/de/LC_MESSAGES/django.po # locale/es/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po		2020-11-16 00:59:26 +01:00
..
note/js	Merge branch 'beta' into JS_translations	2020-11-16 00:59:26 +01:00