f513317ba2
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| base_controller_spec.rb | ||
| oembed_controller_spec.rb | ||
| push_controller_spec.rb | ||
| salmon_controller_spec.rb | ||
| subscriptions_controller_spec.rb | ||