Laurent Destailleur
|
6c47ee22b4
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
.travis.yml
|
2013-09-11 23:12:47 +02:00 |
|
Laurent Destailleur
|
301187a117
|
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
COPYRIGHT
dev/initdata/mysqldump_dolibarr_3.3.0.sql
htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js
|
2013-09-11 21:54:57 +02:00 |
|
Laurent Destailleur
|
d6c35c1ee7
|
Fix: Opensource rules violation (sources must be included with lib)
|
2013-09-11 21:39:33 +02:00 |
|
Raphaël Doursenaud
|
b9ff5188b3
|
Normalized EOL
|
2013-07-01 12:00:42 +02:00 |
|
Regis Houssin
|
930f6e4850
|
Fix: avoid error with crlf
|
2013-06-24 18:04:06 +02:00 |
|
Regis Houssin
|
307ae65924
|
Fix: crlf to lf for avoid errors with git clone
|
2013-06-24 17:43:27 +02:00 |
|
Regis Houssin
|
ae67496730
|
Fix: crlf to lf
|
2013-06-24 17:41:15 +02:00 |
|
Raphaël Doursenaud
|
d34c4518d2
|
Removed BOM from UTF-8 files
Fix: convert line delimiters (regis)
Conflicts:
htdocs/core/filemanagerdol/browser/default/js/common.js
htdocs/core/filemanagerdol/browser/default/js/fckxml.js
|
2012-07-28 19:04:50 +02:00 |
|
Laurent Destailleur
|
9eb8c47870
|
Removed useless file
|
2011-07-21 00:53:23 +00:00 |
|
Laurent Destailleur
|
40e4aeb34a
|
New: Replace internal javascript with jquery plugins.
|
2011-06-11 02:25:05 +00:00 |
|