diff options
| author | Francis Luong (Franco) <fluong@fx-mbp-13.local> | 2016-03-16 00:09:21 -0400 |
|---|---|---|
| committer | Francis Luong (Franco) <fluong@fx-mbp-13.local> | 2016-03-16 00:09:21 -0400 |
| commit | 817b20fda4520e2b5272993aa18d9394178f2d33 (patch) | |
| tree | 2fb8d9ac9888abb2878bb1108e9be0985a5446ae /.gitignore | |
| parent | db8cf9752ebce08b7abb94c10eca4bf70c425250 (diff) | |
| parent | f04db1f70f9888494fc155ca7c06d33f778f9ac0 (diff) | |
| download | ipaddress-817b20fda4520e2b5272993aa18d9394178f2d33.tar.gz | |
Merge remote-tracking branch 'bluemonk/master' into 70-contributing-md
# Conflicts:
# .gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -16,4 +16,5 @@ server.rb *.sw? /tmp/ /_yardoc/ -.idea/
\ No newline at end of file +.idea/ + |