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 |
||
|---|---|---|
| .. | ||
| _index.html.haml | ||
| _new_photo.haml | ||
| _new_profile_photo.haml | ||
| _photo.haml | ||
| edit.html.haml | ||
| show.html.haml | ||
| show.mobile.haml | ||