Merge branch 'test-merger' into merge-shib-eppa-master (210c6d04) · Commits · rc / account-app · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

account-app
- Activity
- Members
- Labels
- Issues
  9
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

210c6d04

Commit 210c6d04 authored 3 years ago by Krish Moodbidri

Downloads
- Plain Diff

Merge branch 'test-merger' into merge-shib-eppa-master

Conflicts:
	app/__init__.py

parents d7b406b7 f544d8b1

No related branches found

No related tags found

1 merge request!22Feat shib-authorization account-error

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/__init__.py 1 addition, 1 deletion

app/__init__.py
app/templates/errors/certification.html 0 additions, 75 deletions

app/templates/errors/certification.html
app/templates/errors/certify.html 2 additions, 2 deletions

app/templates/errors/certify.html
app/templates/errors/shibboleth.html 0 additions, 74 deletions

app/templates/errors/shibboleth.html
tasks.py 22 additions, 2 deletions

tasks.py

with 25 additions and 154 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment