Merge branch 'patch-1' of https://github.com/jancborchardt/awesome-sysadmin into jancborchardt-patch-1

Conflicts:
	README.md
This commit is contained in:
Francisco Augusto 2014-10-04 02:28:25 +02:00
commit 2a00b73cf2

View File

@ -454,7 +454,6 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
*Webmail applications.* *Webmail applications.*
* [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features. * [Mailpile](https://www.mailpile.is/) - A modern, fast web-mail client with user-friendly encryption and privacy features.
* [RainLoop](http://rainloop.net/) - Simple, modern & fast web-based IMAP client.
* [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface. * [Roundcube](http://roundcube.net/) - Browser-based IMAP client with an application-like user interface.
## Web ## Web