Skip to content

Mitx additions shib and apache#1

Merged
carsongee merged 2 commits intomitx-additionsfrom
mitx-additions-auth
Mar 7, 2014
Merged

Mitx additions shib and apache#1
carsongee merged 2 commits intomitx-additionsfrom
mitx-additions-auth

Conversation

@carsongee
Copy link
Copy Markdown
Owner

No description provided.

(cherry picked from commit ff86673)

Conflicts:
	playbooks/roles/shibboleth/tasks/main.yml
(cherry picked from commit b006e39)

Conflicts:
	playbooks/roles/apache/tasks/apache_site.yml
	playbooks/roles/apache/tasks/main.yml
carsongee added a commit that referenced this pull request Mar 7, 2014
@carsongee carsongee merged commit ce327ce into mitx-additions Mar 7, 2014
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.

1 participant