• benoit manager's avatar
    Merge branch 'master' into '1.3-dev' · 3eb191c2
    benoit manager authored
    # Conflicts:
    #   Changelog.md
    #   specs/rhel6/fusiondirectory-plugins.spec
    #   specs/rhel6/fusiondirectory-webservice-shell.spec
    #   specs/rhel6/fusiondirectory.spec
    #   specs/rhel7/fusiondirectory-plugins.spec
    #   specs/rhel7/fusiondirectory-webservice-shell.spec
    #   specs/rhel7/fusiondirectory.spec
    3eb191c2
To find the state of this project's repository at the time of any of these versions, check out the tags.