zhitomirskiyi
|
35cabd469f
|
fixed the merge for the author convention
|
2011-03-10 20:13:52 -08:00 |
|
zhitomirskiyi
|
9b00b2c786
|
Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends'
Conflicts:
app/models/user.rb
spec/integration/receiving_spec.rb
spec/models/mention_spec.rb
spec/models/status_message_spec.rb
|
2011-03-10 19:59:12 -08:00 |
|
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 |
|
zhitomirskiyi
|
80a3a3446a
|
pulling in
|
2011-03-06 21:37:27 -08:00 |
|
zhitomirskiyi
|
e537104fb4
|
pulling in
|
2011-03-06 21:36:03 -08:00 |
|