ilya a46b0479f4 IZ merge conflicts		2010-06-15 14:59:35 -04:00
..
blogs_spec.rb	DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs	2010-06-15 11:09:47 -07:00
bookmark_spec.rb	IZ factories in controller specs as well as bookmark	2010-06-15 14:56:32 -04:00
friend_spec.rb	DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs	2010-06-15 11:09:47 -07:00
status_message_spec.rb	IZ using factories for the spec	2010-06-15 13:18:26 -04:00
user_spec.rb	DG MS IZ; Status message renders to and from xml; Friend model in place	2010-06-14 16:20:57 -07:00