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/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -0,0 +1,6 @@
+(note: this is a temporary file, to be added-to by anybody, and moved to
+release-notes at release time)
+
+Notable changes
+===============
+