Merge branch 'master' into new-website

# Conflicts: # index.html
2018-11-28 14:47:20 +01:00
parent b1611eccd8 a45c735545
commit 6352799ccb
357 changed files with 50 additions and 29780 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -39,10 +39,9 @@ src/runtime/c/sg/.dirstamp
 src/runtime/c/stamp-h1
 src/runtime/java/.libs/
 src/runtime/python/build/
-src/ui/android/libs/
-src/ui/android/obj/
 .cabal-sandbox
 cabal.sandbox.config
+.stack-work
 DATA_DIR

 # Generated documentation (not exhaustive)