Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

926f7cc5

Commit 926f7cc5 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents cdd74b80 96bc2023

Branches

Tags

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

.travis.yml 2 additions, 8 deletions

.travis.yml
build/debian/changelog 1 addition, 1 deletion

build/debian/changelog
build/makepack-dolibarr.pl 35 additions, 11 deletions

build/makepack-dolibarr.pl
build/makepack-howto.txt 14 additions, 11 deletions

build/makepack-howto.txt
composer.json 20 additions, 12 deletions

composer.json
htdocs/core/class/html.form.class.php 6 additions, 6 deletions

htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php 1 addition, 1 deletion

htdocs/filefunc.inc.php
htdocs/product/ajax/products.php 1 addition, 1 deletion

htdocs/product/ajax/products.php
htdocs/product/class/product.class.php 1 addition, 1 deletion

htdocs/product/class/product.class.php

with 81 additions and 52 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