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

..

django.po

Merge branch 'beta' into JS_translations

2020-11-16 00:59:26 +01:00

djangojs.po

Extract strings from javascript files and translate them in french

2020-11-15 23:28:41 +01:00