Merge branch 'master' into Xnew-ui-fixes (5209efe0) · Commits · Perun / Perun ProxyIdP / v1 / simplesamlphp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

simplesamlphp
- Activity
- Members
- Labels
- Jira
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

5209efe0

Unverified Commit 5209efe0 authored 6 years ago by Tim van Dijen Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into Xnew-ui-fixes

parents 107f3772 6645452b

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

modules/consent/docs/consent.md 17 additions, 17 deletions

modules/consent/docs/consent.md
modules/consent/lib/Auth/Process/Consent.php 1 addition, 1 deletion

modules/consent/lib/Auth/Process/Consent.php
modules/consentAdmin/www/consentAdmin.php 1 addition, 0 deletions

modules/consentAdmin/www/consentAdmin.php

with 19 additions and 18 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