Skip to content
Snippets Groups Projects
Commit db091896 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Prepare 3.6.

Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

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

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/impayees.php
	htdocs/filefunc.inc.php
parents 3a0ccdab adb70ecf
No related branches found
No related tags found
No related merge requests found
Showing
with 106 additions and 54 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 to comment