From d76ff9dc9a4c8a8f1286eeb139d8f5af9617f421 Mon Sep 17 00:00:00 2001 From: ORY Continuous Integration Date: Sat, 16 Jun 2018 09:13:14 +0000 Subject: [PATCH] docs: Incorporates changes from version v1.0.0-beta.3-8-g7061a2a --- CHANGELOG.md | 1 + README.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd8779fd0..2359821f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ **Merged pull requests:** +- docs: Adds link to examples repository [\#32](https://github.com/ory/keto/pull/32) ([arekkas](https://github.com/arekkas)) - docs: Adds GitHub templates & code of conduct [\#31](https://github.com/ory/keto/pull/31) ([arekkas](https://github.com/arekkas)) - ci: Prevent pushes from forks to coveralls [\#29](https://github.com/ory/keto/pull/29) ([arekkas](https://github.com/arekkas)) - roles: List roles from keto\_role table [\#28](https://github.com/ory/keto/pull/28) ([sadysnaat](https://github.com/sadysnaat)) diff --git a/README.md b/README.md index 9b06bb075..73d58d4f7 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ a subject (user, application, service, car, ...) is authorized to perform a cert - [Building from source](#building-from-source) - [Ecosystem](#ecosystem) - [ORY Security Console: Administrative User Interface](#ory-security-console-administrative-user-interface) - - [ORY Hydra: OAuth2 & OpenID Connect Server](#ory-hydra-oauth2-&-openid-connect-server) - - [ORY Oathkeeper: Identity & Access Proxy](#ory-oathkeeper-identity-&-access-proxy) + - [ORY Hydra: OAuth2 & OpenID Connect Server](#ory-hydra-oauth2--openid-connect-server) + - [ORY Oathkeeper: Identity & Access Proxy](#ory-oathkeeper-identity--access-proxy) - [Examples](#examples) - [Security](#security) - [Disclosing vulnerabilities](#disclosing-vulnerabilities)