Merge branch 'master' of github.com:YunoHost/doc

This commit is contained in:
YunoHost 2014-07-31 13:28:34 +02:00
commit 77a92a18c6

View file

@ -80,6 +80,7 @@ $(document).ready(function () {
| Ampache | beudbeud | En test | https://github.com/abeudin/ampache_ynh | | Ampache | beudbeud | En test | https://github.com/abeudin/ampache_ynh |
| Piwigo | monsieur-a | En test | https://github.com/monsieur-a/piwigo_ynh | | Piwigo | monsieur-a | En test | https://github.com/monsieur-a/piwigo_ynh |
| Etherpad-Lite | beudbeud | En test | https://github.com/abeudin/etherpadlite_ynh | | Etherpad-Lite | beudbeud | En test | https://github.com/abeudin/etherpadlite_ynh |
| Webmin | tifred | En dev | https://github.com/drfred1981/webmin_ynh |
### À intégrer ### À intégrer
@ -103,3 +104,6 @@ $(document).ready(function () {
* [PHProxy](http://sourceforge.net/projects/poxy/) * [PHProxy](http://sourceforge.net/projects/poxy/)
* [GPodder](https://gpodder.net) * [GPodder](https://gpodder.net)
* [Jitsi Meet](https://github.com/jitsi/jitsi-meet) * [Jitsi Meet](https://github.com/jitsi/jitsi-meet)
* [Mailman](https://www.gnu.org/software/mailman/)
* [Diaspora](https://diasporafoundation.org/)
* [MediaGoblin](http://mediagoblin.org/)