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

Martinfrances107 file annotation #542

Merged
merged 4 commits into from
Mar 30, 2015
Merged

Martinfrances107 file annotation #542

merged 4 commits into from
Mar 30, 2015

Commits on Mar 27, 2015

  1. generate:entity:content file annotation is incorrect - module account? … 

    …hechoendrupal#533
    @martinfrances107
    martinfrances107 committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    5ffa26a View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2015

  1. Merge branch 'master' of https://github.com/martinfrances107/DrupalAp… 

    …pConsole into martinfrances107-master
    @jmolivas
    jmolivas committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    a74f5fc View commit details
    Browse the repository at this point in the history

  2. hechoendrupal#536 Update @file Contains value

    @jmolivas
    jmolivas committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    ebf3aec View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'github/master' into martinfrances107-fi… 

    …le-annotation

Conflicts:
	templates/module/src/accesscontrolhandler-entity-content.php.twig
    @jmolivas
    jmolivas committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    b2d5061 View commit details
    Browse the repository at this point in the history