friend-refactor, also fixed more specs Conflicts: app/models/person.rb app/models/user.rb spec/factories.rb |
||
|---|---|---|
| .. | ||
| diaspora | ||
| net | ||
| tasks | ||
| chrome_frame.rb | ||
| diaspora.rb | ||
| encryptable.rb | ||
| message_handler.rb | ||
friend-refactor, also fixed more specs Conflicts: app/models/person.rb app/models/user.rb spec/factories.rb |
||
|---|---|---|
| .. | ||
| diaspora | ||
| net | ||
| tasks | ||
| chrome_frame.rb | ||
| diaspora.rb | ||
| encryptable.rb | ||
| message_handler.rb | ||