Laurent Destailleur 5ead994955 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	ChangeLog

2014-12-26 04:57:55 +01:00

..

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

paypal.php

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

2014-12-26 04:57:55 +01:00