maxwell c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: lib/diaspora/user/receiving.rb		2010-11-02 12:46:08 -07:00
..
controllers	robustdj's specs now green	2010-11-02 11:27:51 -07:00
helpers	Merge remote branch 'ed0h/helper-method-for-markdown'	2010-11-02 12:14:41 -07:00
mailers	stubbing out the hub publish method	2010-10-29 12:09:10 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-02 12:46:08 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	Remove random href	2010-11-02 12:37:32 -07:00