diff options
author | Matt David <matt@netki.com> | 2016-03-16 22:00:17 -0700 |
---|---|---|
committer | Matt David <matt@netki.com> | 2016-03-16 22:00:17 -0700 |
commit | 4c045c8801fd0e6ed4730f36d5f1648188350b72 (patch) | |
tree | a1c68971ed34c1141d85c99e737da0d6a7b4e7e8 /bip-0015.mediawiki | |
parent | 1f203ea5ca4221430cd133a43cfbe079b0095948 (diff) | |
parent | 3979dbd6daf30d55d7bb115ebdc6228b8eec4b78 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'bip-0015.mediawiki')
-rw-r--r-- | bip-0015.mediawiki | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bip-0015.mediawiki b/bip-0015.mediawiki index c08498f..b90539d 100644 --- a/bip-0015.mediawiki +++ b/bip-0015.mediawiki @@ -1,6 +1,6 @@ <pre> BIP: 15 - Title: BIP Aliases + Title: Aliases Author: Amir Taaki <genjix@riseup.net> Status: Deferred Type: Standards Track |