Skip to content

Commit

Permalink
docs: Incorporates changes from version v1.0.0-beta.4-12-gbfe96e9
Browse files Browse the repository at this point in the history
  • Loading branch information
ORY Continuous Integration committed Jun 16, 2018
1 parent bfe96e9 commit 756178a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@

**Merged pull requests:**

- docs: Adds link to examples repository [\#79](https://github.com/ory/oathkeeper/pull/79) ([arekkas](https://github.com/arekkas))
- docs: Adds gh templates & code of conduct [\#78](https://github.com/ory/oathkeeper/pull/78) ([arekkas](https://github.com/arekkas))
- ci: Prevent pushes from forks to coveralls [\#74](https://github.com/ory/oathkeeper/pull/74) ([arekkas](https://github.com/arekkas))

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ This service is under active development and may introduce breaking changes in f
- [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 Hydra: OAuth2 & OpenID Connect Server](#ory-hydra-oauth2--openid-connect-server)
- [ORY Keto: Access Control Policies as a Server](#ory-keto-access-control-policies-as-a-server)
- [Examples](#examples)
- [Security](#security)
Expand Down

0 comments on commit 756178a

Please sign in to comment.