Skip to content
Snippets Groups Projects
  • ynerant's avatar
    Merge branch 'beta' into JS_translations · 8434c006
    ynerant authored
    # 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
    8434c006
To learn more about this project, read the wiki.