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

Merge remote-tracking branch 'origin/3.9' into 4.0

Browse Source 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php
This commit is contained in:
Laurent Destailleur
2016-07-16 19:54:57 +02:00
parent c3bf1b2619 87c31d0761
commit d0380adc39
25 changed files with 5192 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
View File

@@ -1,6 +1,6 @@
##
## PHPExcel
##
##
## Copyright (c) 2006 - 2013 PHPExcel
##
## This library is free software; you can redistribute it and/or