Skip to content
Commit 789153a7 authored by Thom's avatar Thom 🛠
Browse files

Merge branch 'stable-3.1' into 'add-some-translations'

# Conflicts:
#   interface/web/admin/form/users.tform.php
parents 58102c14 fab638d9
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