dolibarr/htdocs/supplier_proposal
Laurent Destailleur b889db997a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/datepicker.php
	htdocs/core/get_menudiv.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/search_page.php
	htdocs/main.inc.php
	htdocs/master.inc.php
	htdocs/product/list.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/card.php
	htdocs/user/index.php
2017-06-14 10:48:34 +02:00
..
admin Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
class Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-06-03 11:45:15 +02:00
tpl Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
card.php Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-14 10:48:34 +02:00
document.php FIX #6945 2017-06-06 10:53:53 +02:00
index.php Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
info.php Useless bottom-border 2017-03-21 10:54:47 +01:00
list.php Fix code comment 2017-06-10 12:56:28 +02:00
note.php Useless bottom-border 2017-03-21 10:54:47 +01:00