Merging branch v2

2020-06-16 09:51:41 +02:00
parent 7d3cc9f947 0bfdbce908
commit 7fe18a0037
11 changed files with 771 additions and 715 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,4 +1,7 @@
+<<<<<<< HEAD
 root=true
+=======
+>>>>>>> 0bfdbce908484560108e20cede6f9e7c46710818
 [*]
 charset = utf-8
 indent_size = 3