diff options
| author | Ben Hilburn <bhilburn@gmail.com> | 2017-10-18 04:33:40 +0300 |
|---|---|---|
| committer | Ben Hilburn <bhilburn@gmail.com> | 2017-10-18 04:33:40 +0300 |
| commit | f46617acd366b0aab249821ab97c6a955f7b4445 (patch) | |
| tree | b9ecdeb165c9f4352ba696c48ba2fab862ec8618 /.gitignore | |
| parent | 01893a015b2a4ce982069e9e27621911d3b98a60 (diff) | |
| parent | 1f88c289b521a00dc6dede7591de18860d4ce6f6 (diff) | |
Merge branch 'master' into next
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1 +1,2 @@ test-vm/.vagrant +*.swp |