search

hotsh / rstat.us

Simple microblogging network based on the ostatus protocol.
http://rstat.us/
Other
722 stars 215 forks source link

show status implementation #662

Closed DiogoAndre closed 11 years ago

DiogoAndre commented 11 years ago

My attempt to implement the show status api referenced in #574

wilkie commented 11 years ago

You may want to remove that last commit and rebase with master as the travis issue was fixed there as well.

DiogoAndre commented 11 years ago

Removed that last commit.

Shouldn't we instead merge master into twitter-api? I think it's is a better way of bringing the twitter-api branch up to speed with the latest changes in master, and not mess up recent commits to the branch.

makes sense?

wilkie commented 11 years ago

if the goal is to merge this branch into master at a later date, you want to continue to rebase with master regularly.

DiogoAndre commented 11 years ago

not sure if I did this rebase the right way...

DiogoAndre commented 11 years ago

Closing this and adding changes in pull request #674.

carols10cents commented 11 years ago

Blgh yeah I tried rebasing the twitter-api branch and pushing it and I had hoped that would magically make this pull req nicer, but it didn't help. Thank you for being willing to make a new one :)