Laurent Destailleur b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/propal/class/propal.class.php
	htdocs/contrat/class/contrat.class.php

2013-09-13 09:32:41 +02:00

..

_source

Fix: Missing sources

2013-09-12 23:47:36 +02:00

adapters

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00

images

…

lang

Normalized EOL

2013-07-01 12:00:42 +02:00

plugins

Normalized EOL

2013-07-01 12:00:42 +02:00

skins

Fix: avoid error with crlf

2013-06-24 18:04:06 +02:00

themes/default

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00

.htaccess

Normalized EOL

2013-07-01 12:00:42 +02:00

CHANGES.html

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00

ckeditor_basic_source.js

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00

ckeditor_basic.js

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00

ckeditor_php4.php

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

2013-01-13 19:33:54 +01:00

ckeditor_php5.php

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

2013-01-13 19:33:54 +01:00

ckeditor_source.js

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00

ckeditor.asp

Normalized EOL

2013-07-01 12:00:42 +02:00

ckeditor.js

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00

ckeditor.pack

Normalized EOL

2013-07-01 12:00:42 +02:00

ckeditor.php

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

2013-01-13 19:33:54 +01:00

config.js

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00

contents.css

Fix: avoid error with crlf

2013-06-24 18:04:06 +02:00

INSTALL.html

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00

LICENSE.html

Fix: crlf to lf for avoid errors with git clone

2013-06-24 17:43:27 +02:00