summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2020-06-25 05:01:15 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2020-06-25 05:01:15 +0000
commita004e03d0f568163a1c0399f1fd20a99d4837f18 (patch)
tree550b282d3e0bf015423e6d33e9664ed025df3736 /README.mediawiki
parent7e680f9f6b693b36c1220542124fb7d7719719d8 (diff)
parent155ce23c2f78158c92dcde56620e20797c3a3b91 (diff)
downloadbips-a004e03d0f568163a1c0399f1fd20a99d4837f18.tar.xz
Merge remote-tracking branch 'origin-pull/550/head'
Diffstat (limited to 'README.mediawiki')
-rw-r--r--README.mediawiki2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.mediawiki b/README.mediawiki
index f5d7632..38e217a 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -31,7 +31,7 @@ Those proposing changes should consider that ultimately consent may rest with th
| [[bip-0008.mediawiki|8]]
|
| Version bits with lock-in by height
-| Shaolin Fry
+| Shaolin Fry, Luke Dashjr
| Informational
| Rejected
|- style="background-color: #cfffcf"