Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
This commit is contained in:
Laurent Destailleur
2018-07-21 20:28:26 +02:00
parent f419964c76 1d8c42265c
commit 2c7029850a
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/langs/en_US/users.lang
View File

@@ -107,4 +107,5 @@ DisabledInMonoUserMode=Disabled in maintenance mode
UserAccountancyCode=User accounting code
UserLogoff=User logout
UserLogged=User logged
DateEmployment=Date of Employment
DateEmployment=Date of Employment
DateEmploymentEnd=End date of Employment