Merge branch 'master' of https://github.com/krondor/awesome-sysadmin into krondor-master

Conflicts:
	README.md
This commit is contained in:
Francisco Augusto 2014-10-04 01:44:10 +02:00
commit e45ce96b5c

View File

@ -107,8 +107,9 @@ A curated list of amazingly awesome open source sysadmin resources inspired by [
* [Citadel/UX](http://www.citadel.org/) - Collaboration suite (messaging and groupware) that is descended from the Citadel family of programs. * [Citadel/UX](http://www.citadel.org/) - Collaboration suite (messaging and groupware) that is descended from the Citadel family of programs.
* [EGroupware](http://www.egroupware.org/) - Groupware software written in PHP. * [EGroupware](http://www.egroupware.org/) - Groupware software written in PHP.
* [Horde Groupware](http://www.horde.org/apps/groupware) - PHP based collaborative software suite that includes email, calendars, wikis, time tracking and file management.
* [Kolab](https://www.kolab.org) - Another groupware suite. * [Kolab](https://www.kolab.org) - Another groupware suite.
* [SOGo](https://www.sogo.nu/) - Collaborative software server with a focus on simplicity and scalability. * [SOGo](https://www.sogo.nu/) - Collaborative software server with a focus on simplicity and scalability.
* [Zimbra](https://www.zimbra.com/community/) - Collaborative software suite, that includes an email server and web client. * [Zimbra](https://www.zimbra.com/community/) - Collaborative software suite, that includes an email server and web client.
## Configuration Management Database ## Configuration Management Database