dolibarr/htdocs/supplier_proposal
Regis Houssin 1befd9c67f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +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-07-16 07:51:20 +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 6.0 2017-08-23 16:11:51 +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 Fix missing $form 2017-08-22 10:02:45 +02:00
list.php Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
note.php Useless bottom-border 2017-03-21 10:54:47 +01:00