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

Merge master into idempotent rerender #11008

Merged
merged 7 commits into from
May 2, 2015

Conversation

krisselden
Copy link
Contributor

No description provided.

EndangeredMassa and others added 7 commits April 30, 2015 10:40
The [rendered docs](http://emberjs.com/api/classes/Ember.TextSupport.html) do not show these charts properly. I added code fences around them.

If there is some better way to address this, feel free to let me know or just close this PR and updated it yourself. No worries.
…roperty

Remove `_pCacheMeta` property on controllers, which appears to just be leftover from an earlier time.
add code fences around ascii charts in text_support.js
rwjblue added a commit that referenced this pull request May 2, 2015
Merge master into idempotent rerender
@rwjblue rwjblue merged commit a3d4eba into emberjs:idempotent-rerender May 2, 2015
@rwjblue
Copy link
Member

rwjblue commented May 2, 2015

LGTM

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.

6 participants