Skip to content

Commit

Permalink
Merge branch 'contributors-sponsors'
Browse files Browse the repository at this point in the history
  • Loading branch information
saivann committed Sep 5, 2015
2 parents 3392288 + f4a2916 commit 90dc6a0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
6 changes: 6 additions & 0 deletions _templates/about-us.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ <h3 id="maintenance">{% translate maintenance %}</h3>
<p><a href="https://github.com/crwatkins">Craig Watkins</a><span>Wallet maintainer</span></p>
</div>

<h3 id="sponsorship">{% translate sponsorship %}</h3>

<div class="credit">
<p><a href="https://bitcoinfoundation.org/">The Bitcoin Foundation</a><span>2014 - 2015</span></p>
</div>

<h3 id="translation">{% translate translation %}</h3>

<div class="credit">
Expand Down
1 change: 1 addition & 0 deletions _translations/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ en:
helptxt: "You can report any problem or help to improve bitcoin.org on <a href=\"https://github.com/bitcoin-dot-org/bitcoin.org#how-to-participate\">GitHub</a> by opening an issue or a pull request in English. When submitting a pull request, please take required time to discuss your changes and adapt your work. You can help with translations by joining a team on <a href=\"https://github.com/bitcoin-dot-org/bitcoin.org#translation\">Transifex</a>. Please don't ask for promotion for your personal business or website, except for special cases like conferences. Many thanks to all contributors who are spending time improving bitcoin.org!"
maintenance: "Maintenance"
documentation: "Documentation"
sponsorship: "Sponsorship"
translation: "Translation"
inactive_contributors: "Inactive Contributors"
owners: "Domain Owners"
Expand Down

0 comments on commit 90dc6a0

Please sign in to comment.