summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2020-06-25 05:15:05 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2020-06-25 05:15:05 +0000
commitd06654457612f8841cb644470ec863f3605bdfdd (patch)
tree6b2e3eb5c50be567f3d4626d7f1661bec376d2d8 /README.mediawiki
parentfd02fa4bb7ab2238e51fc943ba2d64d33655baf9 (diff)
parentd168a754f115a31c557468b150083260057aafed (diff)
downloadbips-d06654457612f8841cb644470ec863f3605bdfdd.tar.xz
Merge commit 'd168a75'
Diffstat (limited to 'README.mediawiki')
-rw-r--r--README.mediawiki7
1 files changed, 7 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 61f4efd..0b34887 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -385,6 +385,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Justin Newton, Matt David, Aaron Voisine, James MacWhyte
| Standard
| Final
+|-
+| [[bip-0078.mediawiki|78]]
+| Applications
+| A Simple Payjoin Proposal
+| Nicolas Dorier
+| Standard
+| Draft
|- style="background-color: #ffffcf"
| [[bip-0079.mediawiki|79]]
| Applications