Merge remote branch 'upstream/master'

This commit is contained in:
pixelroot 2013-02-20 21:03:36 +01:00
commit c2add79ac0
2 changed files with 2 additions and 4 deletions

View file

@ -36,8 +36,7 @@ Friendica Documentation and Resources
**External Resources** **External Resources**
* [Main Website](http://friendica.com) * [Main Website](http://friendica.com)
* [Forums](http://groups.google.com/group/friendica) * [Mailing List Archive](http://librelist.com/browser/friendica/)
* [Developer Forums](http://groups.google.com/group/friendica-dev)
**About** **About**

View file

@ -36,8 +36,7 @@ Friendica - Dokumentation und Ressourcen
**Externe Ressourcen** **Externe Ressourcen**
* [Haupt-Webseite](http://friendica.com) * [Haupt-Webseite](http://friendica.com)
* [Foren](http://groups.google.com/group/friendica) * [Mailing Liste](http://librelist.com/browser/friendica/)
* [Entwickler-Foren](http://groups.google.com/group/friendica-dev)
* [Deutsches Friendica-Wiki](http://wiki.toktan.org/doku.php) * [Deutsches Friendica-Wiki](http://wiki.toktan.org/doku.php)
**Über diese Seite** **Über diese Seite**