Merge branch 'a5-beta-212' of github.com:paritytech/parity-ethereum i…

…nto a5-beta-212
openethereum · Oct 2, 2018 · d9acc1b · d9acc1b
2 parents 72d8ddc + 835b4ed
commit d9acc1b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 291 deletions.
diff --git a/README.md b/README.md
@@ -23,11 +23,11 @@ By default, Parity Ethereum runs a JSON-RPC HTTP server on port `:8545` and a We
 
 If you run into problems while using Parity Ethereum, check out the [wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/paritytech/parity-ethereum/issues/new), or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help! **For security-critical issues**, please refer to the security policy outlined in [SECURITY.md](SECURITY.md).
 
-Parity Ethereum's current beta-release is 2.0. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
+Parity Ethereum's current beta-release is 2.1. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
 
 ## Build Dependencies
 
-Parity Ethereum requires **Rust version 1.28.x** to build.
+Parity Ethereum requires **Rust version 1.29.x** to build.
 
 We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have `rustup`, you can install it like this:
 

diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile
diff --git a/docker/android/cargo-config.toml b/docker/android/cargo-config.toml
diff --git a/docker/android/libudev.patch b/docker/android/libudev.patch
diff --git a/scripts/gitlab/docs-jsonrpc.sh b/scripts/gitlab/docs-jsonrpc.sh
@@ -29,9 +29,9 @@ setup_git() {
     git config user.name "Devops Parity"
 }
 
-set_remote_wiki() {                                                                                                                                   
-    git config remote.origin.url "https://${GITHUB_TOKEN}@github.com/paritytech/wiki.git"                                                             
-}                                                                                                                                                     
+set_remote_wiki() {
+    git config remote.origin.url "https://${GITHUB_TOKEN}@github.com/paritytech/wiki.git"
+}
 
 commit_files() {
     echo "__________Commit files__________"