reintroduce things skipped on conflict

This commit is contained in:
Dainius
2017-05-10 18:16:41 +03:00
parent 0d75c09036
commit 357083efce
5 changed files with 362 additions and 162 deletions

2
.gitignore vendored
View File

@@ -1,5 +1,7 @@
*py[co]
.idea/
# Test scripts
*.sh