Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	backend/entityservice/VERSION
#	deployment/entity-service/Chart.yaml
#	deployment/entity-service/values.yaml
#	docs/changelog.rst
#	docs/conf.py
#	frontend/VERSION
  • Loading branch information
hardbyte committed Apr 30, 2020
2 parents ade1124 + 07fb18a commit a3cfe26
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ Version 1.13.0-beta
- ``anonlinkclient`` now used for benchmarking. (#490)
- Chart dependencies ``redis-ha``, ``postgres`` and ``minio`` all updated. (#496, #497)

Breaking Change
~~~~~~~~~~~~~~~

Breaking Changes
~~~~~~~~~~~~~~~~
Expand Down

0 comments on commit a3cfe26

Please sign in to comment.