Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

f4da53c3

Commit f4da53c3 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	htdocs/product/liste.php
	htdocs/product/price.php

parents 1007aba6 1fc47166

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 4 additions, 0 deletions

ChangeLog
htdocs/compta/bank/virement.php 2 additions, 2 deletions

htdocs/compta/bank/virement.php
htdocs/core/lib/report.lib.php 2 additions, 2 deletions

htdocs/core/lib/report.lib.php
htdocs/install/upgrade2.php 8 additions, 8 deletions

htdocs/install/upgrade2.php
htdocs/product/liste.php 2 additions, 2 deletions

htdocs/product/liste.php
htdocs/product/price.php 4 additions, 5 deletions

htdocs/product/price.php

with 22 additions and 19 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