Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.3' into develop

Browse Source 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
This commit is contained in:
Laurent Destailleur
2013-04-14 01:46:33 +02:00
parent 38cb9a530f 6ebeb53a2c
commit e5a945ba5b
32 changed files with 171 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/files.lib.php
View File

@@ -1228,4 +1228,4 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('\.meta$
return $tmparray[0];
}
?>
?>