merge master into 321-highway-construction (#321)

This commit is contained in:
golubev 2019-10-15 13:51:02 +03:00
commit 58373dc4b4

3
.gitignore vendored
View File

@ -16,3 +16,6 @@ wikidata/*
# generated source files
build/*
# any IntelliJ IDEA files
.idea/