monero-project/monero-site
monero-project/monero-site
1
0
Fork 0
mirror of https://github.com/monero-project/monero-site.git synced 2024-12-24 12:39:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #211

Browse source 
3e8b589 Update copyright.md (A.J. Santos)
683c6d5 Updated Creative Commons license (A.J. Santos)
f4179e7 Removed dead links (A.J. Santos)
This commit is contained in:
Riccardo Spagni 2017-01-15 18:17:25 -05:00
commit fe434afaef
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
_data/merchants.yml
View file

@ -86,8 +86,6 @@
url: https://www.californiafintech.org/plans/
- name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow
url: mailto:info@loandraw.com
- name: CryptoEscrow Escrow Service
url: http://www.cryptoescrow.eu
- name: Cryptostorm VPN
url: https://cryptostorm.is/
- name: Esperanto lessons from Kaja
@ -102,8 +100,6 @@
url: http://dr.mindsci.com/
- name: Web Developer - Stefanos
url: http://www.stefanosioannou.com/web-development-monero-accepted
- name: XMR.link OpenAlias Registry
url: https://www.xmr.link/
- name: XMR.to Monero to Bitcoin Payment Service
url: https://xmr.to
- category: Goods

2
legal/copyright.md
View file

@ -11,7 +11,7 @@ attribution: ""
### The Monero Project
The majority of the content on this website, including the Monero logo and our Monero Missive podcast, is copyright The Monero Project. It is made available under the CC BY 3.0 license (the [Creative Commons Attribution 3.0 Unported license](http://creativecommons.org/licenses/by/3.0/)). This means that you can copy and redistribute the material in any medium or format, and remix, transform, and build upon the material for any purpose, even commercially. However, when doing so you must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests The Monero Project endorses you or your use.
The majority of the content on this website, including the Monero logo and our Monero Missive podcast, is released under the CC BY-SA 4.0 license (the [Creative Commons Attribution-ShareAlike 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0/)). This means that you can copy and redistribute the material in any medium or format, and remix, transform, and build upon the material for any purpose, even commercially. However, when doing so you must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests The Monero Project endorses you or your use.
### Icons and Other Attributed Items