Skip to content
Snippets Groups Projects
Commit d3cbc6e5 authored by Demian Katz's avatar Demian Katz
Browse files

Merge branch 'release-3.1'

# Conflicts:
#	languages/fr.ini
parents 990bc410 6e9ad6da
Branches
Tags
No related merge requests found
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment