Skip to content
Commit f5cf7f20 authored by Massimiliano's avatar Massimiliano
Browse files

Merge branch 'stable-3.1' into 'db_remote-DNS_Slave_Fix'

# Conflicts:
#   interface/web/admin/form/system_config.tform.php
#   interface/web/admin/lib/lang/en_system_config.lng
#   interface/web/admin/lib/lang/it_system_config.lng
parents 0c0dd465 26009352
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