git.99rst.org / stevenblack-hosts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 318389b 2f90ec0)
Merge remote-tracking branch 'upstream/master' into encoding-review
authorfunilrys <redacted>
Sun, 4 Mar 2018 10:19:36 +0000 (11:19 +0100)
committerfunilrys <redacted>
Sun, 4 Mar 2018 10:19:36 +0000 (11:19 +0100)
1  2 
updateHostsFile.py patch | diff1 | diff2 | blob | history

diff --cc updateHostsFile.py
Simple merge
git clone https://git.99rst.org/PROJECT