Merge branch 'master' into templateallthemarkup
[mkws-moved-to-github.git] / .gitignore
1 *~
2 *.swp