lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b22b604d02
dolibarr/htdocs/theme/eldy
History
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
..
ckeditor New: Another method to allow style tags into email. 2013-03-24 19:00:58 +01:00
img Fix: syntax error 2013-04-13 15:09:57 +02:00
tpl Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
AUTHOR
graph-color.php New: Event into calendar use different colors for different users. 2013-04-11 10:15:53 +02:00
index.php Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
style.css.php Merge remote-tracking branch 'origin/3.4' into develop 2013-06-24 20:02:02 +02:00
thumb.png Qual: Move theme rodolphe and bluelagoon into secondary repository 2010-06-27 21:29:43 +00:00