Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

5853b9eb

Commit 5853b9eb authored 11 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into

marcosgdf-bug-1416

Conflicts:
	ChangeLog

parents 9e912259 0b73b44f

Branches

Tags

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

ChangeLog 4 additions, 1 deletion

ChangeLog
build/debian/changelog 7 additions, 0 deletions

build/debian/changelog
build/exe/doliwamp/doliwamp.iss 2 additions, 2 deletions

build/exe/doliwamp/doliwamp.iss
build/rpm/dolibarr_fedora.spec 3 additions, 0 deletions

build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec 3 additions, 0 deletions

build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec 3 additions, 0 deletions

build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec 3 additions, 0 deletions

build/rpm/dolibarr_opensuse.spec
htdocs/admin/supplier_order.php 1 addition, 0 deletions

htdocs/admin/supplier_order.php
htdocs/filefunc.inc.php 1 addition, 1 deletion

htdocs/filefunc.inc.php

with 27 additions and 4 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