dolibarr/htdocs/theme
Laurent Destailleur 11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
2017-05-05 14:49:25 +02: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-05-05 14:49:25 +02:00
md Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-05 14:49:25 +02:00
.gitignore Merge remote-tracking branch 'origin/3.7' into 3.8 2015-09-22 16:28:34 +02:00
dolibarr_logo.png Fix #3930 Removed executable bit 2015-12-09 13:28:36 +01:00
dolibarr_preferred_partner_int.png Fix: Typo and translation 2014-12-17 01:56:36 +01:00
dolibarr.png Fix #3930 Removed executable bit 2015-12-09 13:28:36 +01:00
doliforge_logo.png Fix #3930 Removed executable bit 2015-12-09 13:28:36 +01:00
dolistore_logo.png Fix #3930 Removed executable bit 2015-12-09 13:28:36 +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
login_background.png Optimized theme images 2014-08-19 12:39:25 +02:00
login_logo.png Optimized theme images 2014-08-19 12:39:25 +02:00