Afri Schoedon 1de095f3bd Backport Master CI PRs to Beta (#7890) ... * Resolve conflicts * Resolve conflicts * Update gitlab-build.sh (#7855) fix build ```version``` after https://github.com/paritytech/parity/pull/7723 * Resolve conflicts * Update gitlab-test.sh (#7883) * Update gitlab-test.sh https://github.com/paritytech/parity/issues/7871 * Update aura-test.sh * Backport master ci prs * Bump beta to 1.9.3 * Make track beta * Downgrade rustc_version		2018-02-14 16:59:16 +01:00
..
installer.nsi	Backport Master CI PRs to Beta (#7890)	2018-02-14 16:59:16 +01:00
logo.ico	Updated icons (#7469)	2018-01-05 13:44:05 +01:00