* origin/master:
add nip-47 to index.
NIP-47: Add error for payment failed
NIP-47: Implement feedback
NIP-47: feedbacj
NIP-47: Fix up some things
NIP-47 Wallet Connect
I think the `nostr:...` scheme is not actually a Uniform Resource Locator, because it doesn't tell you where the data is located. For instance if I see the string `nostr:npub1sn0wdenkukak0d9dfczzeacvhkrgz92ak56egt7vdgzn8pv2wfqqhrjdv9` I understand that this identifies a Nostr keypair but I don't know where to find data for that keypair. The scheme does fall under the definition of a Uniform Resource Identifier, or maybe even the stricter class Uniform Resource Name. But nobody talks about URNs, so maybe best to just use the less-specific term "URI" here.
# By arkin0x (2) and others
# Via GitHub (1) and fiatjaf_ (1)
* origin/master:
Reword description of kind 1063
forgot to update the initial nonce in the explanation
example was incorrect
reword NIP-94 to remove confusion.
blurhash explanation
# Conflicts:
# 13.md
# 94.md
the example event id had 21 leading zeroes, not 20
I provided new C code that has been tested to work (I couldn't get the original example code to work) and I provided some JavaScript code to test event ids as well.
I did not re-compute the event id for the example event; I simply changed the nonce to be 21. Since it is an example, it may not matter that the event id is not correct.
# By frbittencourt (14) and others
# Via fiatjaf_
* origin/master: (23 commits)
Update 01.md
fix: re-add NIP-15 to the list
Add NIP-94 and kind 1063 to README.md
nip update to reach consensus with other nips
fixed text description
Apply suggestions from code review
change to regular event
Update 94.md
Update 94.md
Update 94.md
Update 94.md
Update 94.md
move nip-95 to other branch
ajusts description of decrypt tag
ajusts decrypt tag
ajusts formt text
minor fix
fix example image
fix format text in md
add hash tag
...
# Conflicts:
# 01.md