Sync from Upstream

2019-03-15 21:17:07 +01:00
parent ea53e1f981
commit 6a52b6074f
161 changed files with 2002 additions and 1463 deletions
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -273,4 +273,4 @@ if "--test"==args then
 else
    -- Call the main
    main(args)
-end
+end