aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2017-01-26 13:03:14 +0000
committerGitHub <noreply@github.com>2017-01-26 13:03:14 +0000
commitc1f194244b782f1d43c6cba88fd593fb28675fe4 (patch)
treeb03ebf6b901542dd59881ff0cd798a0e63fe0a86
parentMerge pull request #936 from pszlazak/patch-2 (diff)
parenttryton: link demo to credentials page (diff)
downloadawesome-selfhosted-c1f194244b782f1d43c6cba88fd593fb28675fe4.tar.gz
awesome-selfhosted-c1f194244b782f1d43c6cba88fd593fb28675fe4.zip
Merge pull request #939 from Kickball/dedup-tryton
merge duplicate tryton entries
-rw-r--r--README.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/README.md b/README.md
index 5547902e..9bbe2665 100644
--- a/README.md
+++ b/README.md
@@ -497,7 +497,7 @@ See https://github.com/n1trux/awesome-sysadmin#dns
* [ERPNext](https://erpnext.com) - Free open source ERP system. ([Demo](https://demo.erpnext.com), [Source Code](https://github.com/frappe/erpnext)) `GPLv3` `Python`
* [Odoo](http://odoo.com) - Free open source ERP system. ([Demo](https://demo.odoo.com/), [Source Code](https://github.com/odoo/odoo)) `LGPLv3` `Python`
-* [Tryton](http://www.tryton.org/) - Free open source business solution. ([Demo](http://demo.tryton.org/), [Source Code](https://hg.tryton.org/)) `GPLv3` `Python`
+* [Tryton](http://www.tryton.org/) - Free open source business solution. ([Demo](http://www.tryton.org/download.html), [Source Code](https://hg.tryton.org/)) `GPLv3` `Python`
## Federated Identity/Authentication
@@ -788,7 +788,6 @@ See also https://github.com/n1trux/awesome-sysadmin#it-asset-management
* [Koha](https://koha-community.org/) - Fully featured, scalable library management system (integrated library system - ILS). ([Source Code](https://github.com/Koha-Community/Koha)) `GPLv3` `Perl`
* [PartKeepr](https://www.partkeepr.org) - PartKeepr is an electronic part inventory management software. It helps you to keep track of your available parts and assist you with re-ordering parts. ([Demo](https://demo.partkeepr.org/), [Source Code](https://github.com/partkeepr/PartKeepr)) `GPLv3` `PHP`
* [StockazNG](https://dev.sigpipe.me/dashie/StockazNG) - Asset Management System. `MIT` `Python`
- * [Tryton](http://www.tryton.org/) - Core base of a complete business solution (ERP). ([Demo](http://demo.tryton.org) admin/admin, [Source Code](https://hg.tryton.org)) `GPLv3` `Python`
## Monitoring