merge master into add-garages

2019-10-15 13:45:39 +03:00 · 2019-10-15 13:45:39 +03:00 · 5553b94ca0
commit 5553b94ca0
--- a/.gitignore
+++ b/.gitignore
@ -15,4 +15,7 @@ data/*
 wikidata/*

 # generated source files
-build/*
+build/*
+
+# any IntelliJ IDEA files
+.idea/