Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Init attributes in InheritedResources controller w/ specs #653

Merged
merged 4 commits into from Jun 19, 2012
Merged

Init attributes in InheritedResources controller w/ specs #653

merged 4 commits into from Jun 19, 2012

Conversation

andhapp
Copy link
Collaborator

@andhapp andhapp commented Jun 18, 2012

Includes the same changes as #546. Thanks to @mikepack and @mccraigmccraig for fixing it initially. I just pulled their changes and ensured that it was automerging. Making it easier to be pulled into master.

mccraigmccraig and others added 4 commits June 19, 2012 00:08
Remove inconsistent line breaks.
…ge althought there weren't any conflicts. Fix it so that it's easier to just merge via the UI.
ryanb added a commit that referenced this pull request Jun 19, 2012
Init attributes in InheritedResources controller w/ specs
@ryanb ryanb merged commit 2b89dbb into ryanb:master Jun 19, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants