Conflicts:
index.html
You can view, comment on, or merge this pull request online at:
https://github.com/w3c/webpayments-payment-apps-api/pull/86
-- Commit Summary --
* (Deleted this edit by mistake before merged)
* Merge remote-tracking branch 'w3c/gh-pages' into gh-pages
* Edits based on recent changes and discussions
* Edits based on recent changes and discussions
* Merge branch 'gh-pages' of https://github.com/ianbjacobs/webpayments-payment-apps-api into gh-pages
* Updated formulation based on 10 January discussion
* Move secure context note from intro to where the requirement is listed.
* Add link to issue 48 per AHB request
* Merge branch 'sec20170112' into gh-pages
-- File Changes --
M index.html (338)
-- Patch Links --
https://github.com/w3c/webpayments-payment-apps-api/pull/86.patch
https://github.com/w3c/webpayments-payment-apps-api/pull/86.diff
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/w3c/webpayments-payment-apps-api/pull/86