Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
vixentael committed Mar 15, 2019
2 parents a276d6b + 9592e0f commit b4b7f1b
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
@@ -1,6 +1,6 @@
# Acra ChangeLog

## [0.85.0](https://github.com/cossacklabs/acra/releases/tag/0.85), March 7th 2018
## [0.85.0](https://github.com/cossacklabs/acra/releases/tag/0.85), March 15th 2018

_Core_:

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-addzone.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# path to config
config_file:

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-authmanager.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# path to config
config_file:

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-connector.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# Port of Acra HTTP API
acraserver_api_connection_port: 9090

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-keymaker.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# Client ID
client_id: client

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-poisonrecordmaker.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# path to config
config_file:

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-rollback.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# Client ID should be name of file with private key
client_id:

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-rotate.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# path to config
config_file:

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-server.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# Path to AcraCensor configuration file
acracensor_config_file:

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-translator.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# path to config
config_file:

Expand Down
2 changes: 1 addition & 1 deletion configs/acra-webconfig.yaml
@@ -1,4 +1,4 @@
version: 0.84.2
version: 0.85.0
# path to config
config_file:

Expand Down

0 comments on commit b4b7f1b

Please sign in to comment.