Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

44bfc1db

Commit 44bfc1db authored 12 years ago by Juanjo Menent

Downloads
- Plain Diff

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

parents 9e8c3a1b 59dfab9d

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/compta/bank/treso.php 1 addition, 1 deletion

htdocs/compta/bank/treso.php
htdocs/core/boxes/box_factures_fourn.php 3 additions, 3 deletions

htdocs/core/boxes/box_factures_fourn.php
htdocs/fourn/facture/fiche.php 1 addition, 1 deletion

htdocs/fourn/facture/fiche.php
htdocs/install/mysql/migration/3.3.0-3.4.0.sql 1 addition, 1 deletion

htdocs/install/mysql/migration/3.3.0-3.4.0.sql
htdocs/install/upgrade.php 2 additions, 2 deletions

htdocs/install/upgrade.php
htdocs/webservices/server_supplier_invoice.php 7 additions, 1 deletion

htdocs/webservices/server_supplier_invoice.php

with 15 additions and 9 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