Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

0314b3b5

Commit 0314b3b5 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	ChangeLog

parents 5b305249 8f0a004a

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 109 additions, 1 deletion

ChangeLog
build/makepack-dolibarr.pl 3 additions, 0 deletions

build/makepack-dolibarr.pl
htdocs/categories/class/categorie.class.php 1 addition, 1 deletion

htdocs/categories/class/categorie.class.php
htdocs/fourn/facture/card.php 1 addition, 1 deletion

htdocs/fourn/facture/card.php
htdocs/public/demo/index.php 5 additions, 5 deletions

htdocs/public/demo/index.php
htdocs/societe/consumption.php 1 addition, 3 deletions

htdocs/societe/consumption.php

with 120 additions and 11 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