Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

dc438792

Commit dc438792 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/fourn/commande/card.php

parents 627f606c 9be246ba

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/class/html.form.class.php 1 addition, 1 deletion

htdocs/core/class/html.form.class.php
htdocs/fourn/commande/card.php 11 additions, 2 deletions

htdocs/fourn/commande/card.php
htdocs/product/class/product.class.php 2 additions, 2 deletions

htdocs/product/class/product.class.php
htdocs/product/price.php 1 addition, 1 deletion

htdocs/product/price.php

with 15 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment