dolibarr/htdocs
Laurent Destailleur 3cc312d485 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/main.lang
2017-03-23 19:48:34 +01:00
..
accountancy Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-19 11:26:49 +01:00
adherents Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-19 11:26:49 +01:00
admin Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 12:52:19 +01:00
api Fix #6365 2017-02-03 11:42:49 +01:00
asterisk
barcode
bookmarks NEW Can use dol_fiche_end without showing bottom border. 2017-03-15 11:13:30 +01:00
cashdesk Page societe/soc.php and compta/facture.php was renamed into card.php 2017-03-20 21:29:22 +01:00
categories FIX #6535 2017-03-16 22:49:02 +01:00
comm Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 12:52:19 +01:00
commande Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 12:52:19 +01:00
compta Uniformize code 2017-03-23 16:10:38 +01:00
conf
contact Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-23 02:55:50 +01:00
contrat Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 12:52:19 +01:00
core Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 19:48:34 +01:00
cron Fix parameters 2017-02-27 00:22:11 +01:00
custom
don Merge pull request #6492 from aspangaro/6.0-donation 2017-03-10 12:31:46 +01:00
ecm Uniformize look and feels 2017-03-07 18:34:57 +01:00
expedition Page societe/soc.php and compta/facture.php was renamed into card.php 2017-03-20 21:29:22 +01:00
expensereport css enhancement 2017-03-21 18:23:58 +01:00
exports Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-19 11:26:49 +01:00
externalsite
fichinter Page societe/soc.php and compta/facture.php was renamed into card.php 2017-03-20 21:29:22 +01:00
fourn Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 12:52:19 +01:00
ftp
holiday CSS enhancement 2017-03-23 10:59:13 +01:00
hrm Fix closing boxes 2017-03-15 11:58:13 +01:00
imports
includes NEW Add function dolMd2Html 2017-03-21 16:03:13 +01:00
install Uniformize code 2017-03-23 16:10:38 +01:00
langs Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 19:48:34 +01:00
livraison
loan Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
mailmanspip
margin Remove border-bottom useless 2017-03-23 13:06:38 +01:00
multicurrency/class
opensurvey NEW Add function ajax_autoselect 2017-03-23 11:16:30 +01:00
paybox
paypal NEW Add function ajax_autoselect 2017-03-23 11:16:30 +01:00
printing
product Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 12:52:19 +01:00
projet Better board for open items 2017-03-23 19:26:28 +01:00
public Work on module website 2017-02-24 21:13:40 +01:00
resource Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-23 02:55:50 +01:00
societe Remove border-bottom useless 2017-03-23 13:06:38 +01:00
supplier_proposal Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 12:52:19 +01:00
support Clean admin menu entries 2017-02-22 02:19:50 +01:00
theme Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 19:48:34 +01:00
user Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 11:38:46 +01:00
variants Uniformize code 2017-03-12 17:10:32 +01:00
webservices
websites Work on module website 2017-02-24 21:13:40 +01:00
.gitignore
cache.manifest
document.php
favicon.ico
filefunc.inc.php Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-19 11:26:49 +01:00
index.php Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 19:48:34 +01:00
main.inc.php Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 12:52:19 +01:00
master.inc.php
robots.txt
viewimage.php