Laurent Destailleur 3cc312d485 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/langs/en_US/main.lang

2017-03-23 19:48:34 +01:00

..

common

Move resources for theme at a batter place

2017-02-24 14:38:20 +01:00

eldy

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-23 19:48:34 +01:00

md

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-23 19:48:34 +01:00

.gitignore

…

dolibarr_logo.png

…

dolibarr_preferred_partner_int.png

…

dolibarr.png

…

doliforge_logo.png

…

dolistore_logo.png

…

index.html

…

login_background.png

…

login_logo.png

…