aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2015-10-09 21:19:31 +0000
committernodiscc <nodiscc@gmail.com>2015-10-09 21:19:31 +0000
commit962383fd1ea597c4932a87c20ea8381307ab5d8d (patch)
treea6ceb0933dc6f03540d3cd417b0385e1c7fbd4f5 /README.md
parentrename media streaming to video streaming, fixes https://github.com/Kickball/... (diff)
parentfix for item landed in wrong category (diff)
downloadawesome-selfhosted-962383fd1ea597c4932a87c20ea8381307ab5d8d.tar.gz
awesome-selfhosted-962383fd1ea597c4932a87c20ea8381307ab5d8d.zip
Merge remote-tracking branch 'kickball/pr/291'
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 389d44b2..eac9c36c 100644
--- a/README.md
+++ b/README.md
@@ -571,10 +571,10 @@ _Distributed filesystems_
* [MaterialPoll](https://github.com/nearbycoder/materialpoll) - an opensource strawpoll.me clone for creating random polls. - ([Source code](https://github.com/nearbycoder/materialpoll), [Demo](http://materialpoll.tk))
* [Nuages](https://nuages.domainepublic.net/) - collaborative meeting poll system, similar to doodle or rdvz ([Source code](http://git.domainepublic.net/?p=nuages.git;a=tree)) `GPLv3` `Python/Django`
* [OpenSondage](https://github.com/leblanc-simon/OpenSondage) - an online service for planning an appointment or make a decision quickly and easily: Make a poll, Define dates or subjects to choose, Send the poll link to your friends or colleagues, Discuss and make a decision - ([Demo](http://framadate.org/), [Example](https://framadate.org/aqg259dth55iuhwm))
- * [scotty](http://www.scotty-transporter.org/) - Scotty is a free opensource proxy software for bypassing filter and censorship systems. - ([Source Code](https://github.com/SSilence/scotty)) `GPLv3` `Java`
## Proxy
+ * [scotty](http://www.scotty-transporter.org/) - Scotty is a free opensource proxy software for bypassing filter and censorship systems. - ([Source Code](https://github.com/SSilence/scotty)) `GPLv3` `Java`
* [Oranjeproxy](http://lehollandaisvolant.net/tout/oranjeproxy/) - Anonymizing web proxy ([Source code](https://github.com/AmauryCarrade/OranjeProxy)) `GPLv2` `PHP`
* [Privoxy](http://www.privoxy.org) - a non-caching web proxy with advanced filtering capabilities for enhancing privacy, modifying web page data and HTTP headers, controlling access, and removing ads and other obnoxious Internet junk `GPLv2` `C`
* [Squid](http://www.squid-cache.org/) - caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. ([Source code](http://bazaar.launchpad.net/~squid/squid/3-trunk/files)) `GPLv2` `C`