Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

01541e41

Commit 01541e41 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/comm/action/card.php
	htdocs/core/datepicker.php

parents 21c78cc3 20121c2f

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/comm/action/card.php 2 additions, 2 deletions

htdocs/comm/action/card.php
htdocs/comm/action/peruser.php 10 additions, 3 deletions

htdocs/comm/action/peruser.php
htdocs/core/datepicker.php 24 additions, 14 deletions

htdocs/core/datepicker.php
htdocs/core/lib/date.lib.php 8 additions, 6 deletions

htdocs/core/lib/date.lib.php
htdocs/core/lib/functions.lib.php 5 additions, 4 deletions

htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/products.lang 3 additions, 3 deletions

htdocs/langs/en_US/products.lang
test/phpunit/DateLibTest.php 20 additions, 0 deletions

test/phpunit/DateLibTest.php
test/phpunit/FunctionsLibTest.php 28 additions, 0 deletions

test/phpunit/FunctionsLibTest.php

with 100 additions and 32 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