Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doc #870

Closed
wants to merge 5 commits into from
Closed

Doc #870

wants to merge 5 commits into from

Conversation

joliss
Copy link
Contributor

@joliss joliss commented May 23, 2012

  • Add @scope so properties are picked up by JsDoc
  • Add TODO note about Ember.Location documentation
  • Fix indentation
  • Make identical assertion messages distinguishable
  • Add documentation stub for Ember.Router

@travisbot
Copy link

This pull request passes (merged 52753ae4 into 2756d58).

@joliss
Copy link
Contributor Author

joliss commented May 24, 2012

I resolved some conflicts and repushed, so it should merge now. /cc @wagenet

As always, feel free to cherry-pick if you're unsure about some of the commits.

@wagenet
Copy link
Member

wagenet commented May 24, 2012

@joliss, now that we have 0-9-stable, I'd like for all applicable commits to go there first. 0-9-stable will then be merged into master. To that end I cherry-picked the first 4 commits to 0-9-stable and the last one to master.

@wagenet wagenet closed this May 24, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants