maxwell 9c2ca15e93 Merge branch 'master' of github.com:diaspora/diaspora		2010-10-29 12:09:32 -07:00
..
controllers	Merge remote branch 'ed0h/309-user-choose-language'	2010-10-29 12:06:14 -07:00
fixtures	EM websocket cleanly merged with master. webfingering is now async	2010-10-29 11:05:17 -07:00
helpers	EM websocket cleanly merged with master. webfingering is now async	2010-10-29 11:05:17 -07:00
lib	stubbing out the hub publish method	2010-10-29 12:09:10 -07:00
mailers	MS IZ request acceptance email	2010-10-22 11:55:50 -07:00
models	Merge remote branch 'ed0h/309-user-choose-language'	2010-10-29 12:06:14 -07:00
factories.rb	OmniauthService -> Service. Cleaned up views.	2010-10-25 17:41:59 -07:00
helper_methods.rb	IZ moved methods found in spec helper to helper methods file. now we can include them in the db scripts to keep friending behavior in sync	2010-10-27 10:32:09 -07:00
misc_spec.rb	Factory.build saves users	2010-10-27 11:03:57 -07:00
spec_helper.rb	stubbing out the hub publish method	2010-10-29 12:09:10 -07:00