Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/contrib/ci-workers/vars/Archlinux.yml
+++ b/contrib/ci-workers/vars/Archlinux.yml
@@ -0,0 +1,7 @@
+---
+buildbot_deps:
+  - python2-pip
+build_deps:
+  - multilib/gcc
+  - make
+pip_bin_dir: /usr/bin