Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

033757aa

Commit 033757aa authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php

parents b919318b 4ce7a27d

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/comm/propal.php 1 addition, 2 deletions

htdocs/comm/propal.php
htdocs/commande/card.php 4 additions, 5 deletions

htdocs/commande/card.php
htdocs/compta/facture.php 1 addition, 2 deletions

htdocs/compta/facture.php
htdocs/install/mysql/migration/repair.sql 1 addition, 1 deletion

htdocs/install/mysql/migration/repair.sql

with 7 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