Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

1658bee8

Commit 1658bee8 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents 480a398f 6763b5ba

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/admin/salaries.php 2 additions, 2 deletions

htdocs/admin/salaries.php
htdocs/contrat/card.php 34 additions, 3 deletions

htdocs/contrat/card.php
htdocs/core/db/DoliDB.class.php 6 additions, 4 deletions

htdocs/core/db/DoliDB.class.php
htdocs/core/js/lib_head.js 2 additions, 2 deletions

htdocs/core/js/lib_head.js
htdocs/core/lib/ajax.lib.php 2 additions, 2 deletions

htdocs/core/lib/ajax.lib.php
htdocs/langs/en_US/products.lang 1 addition, 0 deletions

htdocs/langs/en_US/products.lang
htdocs/langs/fr_FR/products.lang 1 addition, 0 deletions

htdocs/langs/fr_FR/products.lang

with 48 additions and 13 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