friend-refactor, also fixed more specs Conflicts: app/models/person.rb app/models/user.rb spec/factories.rb |
||
|---|---|---|
| .. | ||
| diaspora_parser_spec.rb | ||
| message_handler_spec.rb | ||
| socket_renderer_spec.rb | ||
| web_hooks_spec.rb | ||
friend-refactor, also fixed more specs Conflicts: app/models/person.rb app/models/user.rb spec/factories.rb |
||
|---|---|---|
| .. | ||
| diaspora_parser_spec.rb | ||
| message_handler_spec.rb | ||
| socket_renderer_spec.rb | ||
| web_hooks_spec.rb | ||