Attempt to resolve some of the conflicts with master (d58a3e03) · 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.

d58a3e03

Commit d58a3e03 authored 6 years ago by Tim van Dijen

Downloads
- Patches
- Plain Diff

Attempt to resolve some of the conflicts with master

parent a8d3ac63

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 1 deletion

.travis.yml
lib/SimpleSAML/XHTML/Template.php 2 additions, 1 deletion

lib/SimpleSAML/XHTML/Template.php
modules/consent/dictionaries/consent.definition.json 1 addition, 1 deletion

modules/consent/dictionaries/consent.definition.json
modules/consent/dictionaries/consent.php 1 addition, 1 deletion

modules/consent/dictionaries/consent.php
modules/consent/templates/consentform.php 2 additions, 2 deletions

modules/consent/templates/consentform.php
modules/core/www/frontpage_config.php 76 additions, 87 deletions

modules/core/www/frontpage_config.php
modules/oauth/lib/Consumer.php 15 additions, 35 deletions

modules/oauth/lib/Consumer.php
modules/oauth/lib/OAuthStore.php 21 additions, 27 deletions

modules/oauth/lib/OAuthStore.php
modules/oauth/libextinc/OAuth.php 24 additions, 18 deletions

modules/oauth/libextinc/OAuth.php

with 143 additions and 173 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