Skip to content
Snippets Groups Projects
Commit 8434c006 authored by ynerant's avatar ynerant
Browse files

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
parents b9d49d53 6d976f32
No related branches found
No related tags found
Pipeline #8807 passed with stages
in 15 minutes and 52 seconds