Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

7bddca94

Commit 7bddca94 authored 9 years ago by Marcos García de La Fuente

Downloads
- Plain Diff

Merge branch '3.7' into bug-2900

Conflicts:
	ChangeLog

parents 60711d35 babd4802

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 3 additions, 2 deletions

ChangeLog
htdocs/compta/localtax/clients.php 1 addition, 1 deletion

htdocs/compta/localtax/clients.php
htdocs/compta/localtax/quadri_detail.php 2 additions, 2 deletions

htdocs/compta/localtax/quadri_detail.php
htdocs/product/card.php 8 additions, 3 deletions

htdocs/product/card.php
htdocs/product/list.php 2 additions, 2 deletions

htdocs/product/list.php

with 16 additions and 10 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