Commit 90e364f8 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge remote-tracking branch 'origin/master'

parents 87eceb96 ab9f0fc2
Loading
Loading
Loading
Loading
Compare 9544316e to 5fa7824e
Original line number Diff line number Diff line
Subproject commit 9544316ef95c2aa1e75101a7dce545b4604b3ca6
Subproject commit 5fa7824ea59ec12a976f348a83399e66699456ea
+3 −0
Original line number Diff line number Diff line
setl expandtab
setl textwidth=76
setl spell

" Until the double-space at line end issue is resolved
setl nojoinspaces
Compare bfc1745f to 0e948d51
Original line number Diff line number Diff line
Subproject commit bfc1745f3b536f593eb0ea8525ae53a59b91d0d3
Subproject commit 0e948d514cc45d8ac7fea10f416f6446e9db19c1
Compare d1c983f3 to 065b0be6
Original line number Diff line number Diff line
Subproject commit d1c983f3dd9a159c128c5192062caf7d47fd0f14
Subproject commit 065b0be69415ed7f7bdd8b46a80f07f73b1f6cfa
+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ dev
dhcp
dir
dirname
docstring
docstrings
eg
enums
env
@@ -64,6 +66,7 @@ metaclasses
metadata
metaname
mnt
multiline
nameserver
nameservers
namespace