diff options
author | Ben Hilburn <bhilburn@gmail.com> | 2018-03-07 04:58:12 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-07 04:58:12 +0300 |
commit | f17a715610246cb4abe965b2e479ee168c800ad6 (patch) | |
tree | 3bb95175448c096bf360fd1115619d79d28f5f3b /.gitignore | |
parent | 162caba19cdc51ea52eb5fabd5d18f03cb20e467 (diff) | |
parent | b8a68dd4a88cc0454ed1e385765d368e7fb50429 (diff) |
Merge branch 'next' into master
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,2 +1,3 @@ test-vm/.vagrant *.swp +.idea
\ No newline at end of file |