Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

c37e873a

Commit c37e873a authored 12 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.3' into develop

Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php

parents faf1f440 ae2355fd

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/comm/propal.php 10 additions, 10 deletions

htdocs/comm/propal.php
htdocs/commande/fiche.php 9 additions, 9 deletions

htdocs/commande/fiche.php
htdocs/compta/facture.php 1 addition, 1 deletion

htdocs/compta/facture.php
htdocs/core/lib/functions.lib.php 1 addition, 1 deletion

htdocs/core/lib/functions.lib.php
htdocs/core/modules/modCommande.class.php 2 additions, 2 deletions

htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php 5 additions, 1 deletion

htdocs/core/modules/modFacture.class.php
htdocs/theme/amarok/style.css.php 1 addition, 1 deletion

htdocs/theme/amarok/style.css.php

with 29 additions and 25 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