danielvincent 4da68fc4b1 fixed merge error

2010-06-15 12:28:21 -07:00

..

blogs_controller_spec.rb

DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs

2010-06-15 11:09:47 -07:00

bookmarks_controller_spec.rb

fixed merge error

2010-06-15 12:28:21 -07:00

friends_controller_spec.rb

fixed merge error

2010-06-15 12:28:21 -07:00

status_messages_controller_spec.rb

fixed merge error

2010-06-15 12:28:21 -07:00

users_controller_spec.rb

DG MS IZ; Status message renders to and from xml; Friend model in place

2010-06-14 16:20:57 -07:00