dolibarr/htdocs/theme
Laurent Destailleur 1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
2013-06-24 20:02:02 +02:00
..
amarok Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
auguria Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
bureau2crea Merge remote-tracking branch 'origin/3.4' into develop 2013-06-24 20:02:02 +02:00
cameleo Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
common Add gg flag 2012-10-17 12:40:10 +02:00
eldy Merge remote-tracking branch 'origin/3.4' into develop 2013-06-24 20:02:02 +02:00
.gitignore Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +01:00
dolibarr_logo.png Fix: logo size was too large. 2012-04-14 02:54:07 +02:00
dolibarr.png Update the about page. 2012-03-10 13:52:08 +01:00
doliforge_logo.png Update the about page. 2012-03-10 13:52:08 +01:00
dolistore_logo.png Update the about page. 2012-03-10 13:52:08 +01:00
index.php Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
login_background.png
login_logo.png