2
0
forked from Wavyzz/dolibarr
Commit Graph

8 Commits

Author SHA1 Message Date
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
0e13ded641 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
2014-05-18 11:57:18 +02:00
Laurent Destailleur
7216b2a843 Fix phpunit to be compatible with new version of phpunit 2014-05-02 00:08:27 +02:00
Laurent Destailleur
876a35d1a1 Fix phpunit to be compatible with new version of phpunit 2014-05-02 00:08:19 +02:00
Laurent Destailleur
de97cd1812 Fix: json 2013-10-11 18:33:21 +02:00
Laurent Destailleur
f1f7ff315f Fix: CRLF 2013-01-16 15:54:07 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
ca6e9643ea Fix: Pb in json function for objects 2012-12-29 12:21:13 +01:00