Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.
5bf5003384