Merge remote branch 'upstream/master'
This commit is contained in:
commit
c2add79ac0
2 changed files with 2 additions and 4 deletions
|
@ -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**
|
||||||
|
|
||||||
|
|
|
@ -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**
|
||||||
|
|
Loading…
Reference in a new issue