danielgrippi 1f5edb1d92 Merge branch 'private_messages' ... Conflicts: app/controllers/status_messages_controller.rb app/models/data_point.rb app/models/status_message.rb db/schema.rb lib/fake.rb public/stylesheets/sass/application.sass spec/models/mention_spec.rb		2011-03-08 21:23:41 -08:00
..
jobs	notifier for the messages, we're so close	2011-03-08 10:53:49 -08:00
notifications	notifier for the messages, we're so close	2011-03-08 10:53:49 -08:00
services
user
aspect_membership_spec.rb
aspect_spec.rb
comment_spec.rb
contact_spec.rb
conversation_spec.rb	added the email notification, the notification is not persisted, fixed the receive callback spec	2011-03-08 18:24:56 -08:00
conversation_visibility_spec.rb
invitation_spec.rb
mention_spec.rb	Merge branch 'private_messages'	2011-03-08 21:23:41 -08:00
message_spec.rb	added the email notification, the notification is not persisted, fixed the receive callback spec	2011-03-08 18:24:56 -08:00
notification_spec.rb	notifier for the messages, we're so close	2011-03-08 10:53:49 -08:00
person_spec.rb
photo_spec.rb
post_spec.rb
post_visibility_spec.rb
profile_spec.rb
request_spec.rb
retraction_spec.rb
status_message_spec.rb	Merge branch 'private_messages'	2011-03-08 21:23:41 -08:00
user_spec.rb