Merge pull request #2968 from dmorley/patch-12

remove shapado and getsatisfaction
This commit is contained in:
Maxwell Salzberg 2012-03-01 10:25:23 -08:00
commit 7036c82562

View file

@ -83,8 +83,6 @@ Ongoing discussion:
- [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev)
- [Diaspora Discussion Google Group](http://groups.google.com/group/diaspora-discuss)
- [Diaspora Q&A site](http://diaspora.shapado.com/)
- [Diaspora on Get Satisfaction](http://getsatisfaction.com/diaspora/)
- [#diaspora IRC channel](irc://irc.freenode.net/#diaspora)
([join via the web client](http://webchat.freenode.net?channels=diaspora))
- [#diaspora-dev IRC channel](irc://irc.freenode.net/#diaspora-dev)