Merge branch 'master' into 2pick

db7c71b9 · Momobako · 38d1da84 · 85778b5c · db7c71b9
Commit db7c71b9 authored Dec 29, 2017 by Momobako
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.gitignore .gitignore +1 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
 # data files
+/beta
 /expansions
 /specials