Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

6391fd0c

Commit 6391fd0c authored 9 years ago by Florian Henry

Downloads
- Plain Diff

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

parents 3d8a7ee1 deb62f1f

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/core/class/html.form.class.php 10 additions, 4 deletions

htdocs/core/class/html.form.class.php
htdocs/core/class/html.formother.class.php 6 additions, 2 deletions

htdocs/core/class/html.formother.class.php
htdocs/core/lib/ajax.lib.php 1 addition, 1 deletion

htdocs/core/lib/ajax.lib.php
htdocs/core/menus/standard/eldy.lib.php 4 additions, 1 deletion

htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/list.php 32 additions, 18 deletions

htdocs/expedition/list.php
htdocs/langs/en_US/trips.lang 8 additions, 8 deletions

htdocs/langs/en_US/trips.lang
htdocs/langs/en_US/workflow.lang 6 additions, 6 deletions

htdocs/langs/en_US/workflow.lang
htdocs/product/card.php 60 additions, 0 deletions

htdocs/product/card.php

with 127 additions and 40 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