forked from Wavyzz/dolibarr
develop Conflicts: htdocs/langs/ca_ES/admin.lang htdocs/langs/es_ES/admin.lang Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
develop Conflicts: htdocs/langs/ca_ES/admin.lang htdocs/langs/es_ES/admin.lang Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b