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.

Sign up for GitHub

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

Jump to bottom

Merge controller properties correctly #746

Closed
wants to merge 3 commits into from
Closed

Merge controller properties correctly #746

wants to merge 3 commits into from

Commits on Jul 31, 2012

  1. fixes the merging of controller properties

    euromark committed Jul 31, 2012
    Copy the full SHA
    1d3986f View commit details
    Browse the repository at this point in the history

  2. adding a test to show that merging can be disabled using `'HelperName… 

    …' => false`
    euromark committed Jul 31, 2012
    Copy the full SHA
    beb85d6 View commit details
    Browse the repository at this point in the history

  3. fix whitespace

    euromark committed Jul 31, 2012
    Copy the full SHA
    2ee9e59 View commit details
    Browse the repository at this point in the history