Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

341e014a

Commit 341e014a authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/don/document.php

parents b4c20f1b bb5df3be

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

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

htdocs/admin/confexped.php
htdocs/admin/expedition.php 1 addition, 1 deletion

htdocs/admin/expedition.php
htdocs/contact/class/contact.class.php 5 additions, 4 deletions

htdocs/contact/class/contact.class.php
htdocs/core/class/commonobject.class.php 2 additions, 2 deletions

htdocs/core/class/commonobject.class.php
htdocs/core/lib/ajax.lib.php 2 additions, 1 deletion

htdocs/core/lib/ajax.lib.php
htdocs/core/lib/donation.lib.php 9 additions, 0 deletions

htdocs/core/lib/donation.lib.php
htdocs/don/document.php 0 additions, 2 deletions

htdocs/don/document.php
htdocs/don/note.php 99 additions, 0 deletions

htdocs/don/note.php
htdocs/langs/en_US/main.lang 1 addition, 1 deletion

htdocs/langs/en_US/main.lang
htdocs/main.inc.php 1 addition, 1 deletion

htdocs/main.inc.php
scripts/cron/cron_run_jobs.php 1 addition, 1 deletion

scripts/cron/cron_run_jobs.php

with 123 additions and 15 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