Skip to content

Commit

Permalink
Integrated Commit: Changes emails from ZCash to zencash Changes admin…
Browse files Browse the repository at this point in the history
…@zensystem.io to info@zensystem.io #4956fd03
  • Loading branch information
FranckDG committed Jan 31, 2018
1 parent a117db4 commit 100579b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This issue tracker is only for technical issues related to Zen.

General Zen questions and/or support requests and are best directed to the [Slack](https://zencash.slack.com).

For reporting security vulnerabilities or for sensitive discussions with our security team, please post a message in #developers within the above Slack, or email admin@zensystem.io with information.
For reporting security vulnerabilities or for sensitive discussions with our security team, please post a message in #developers within the above Slack, or email info@zensystem.io with information.

### Describe the issue
Please provide a general summary of the issue you're experiencing
Expand Down
5 changes: 2 additions & 3 deletions code_of_conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,12 @@ is deemed necessary and appropriate to the circumstances. Maintainers are
obligated to maintain confidentiality with regard to the reporter of an
incident.

You may send reports to [our Conduct email](mailto:conduct@z.cash).
You may send reports to [our Conduct email](mailto:info@zensystem.io).

If you wish to contact specific maintainers directly, the following have made
themselves available for conduct issues:

- Daira Hopwood (daira at z.cash)
- Sean Bowe (sean at z.cash)
- Jake (jake at zensystem.io)


This Code of Conduct is adapted from the [Contributor Covenant][homepage],
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/control
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Source: zcash
Section: utils
Priority: optional
Maintainer: Zen Blockchain Foundation <admin@zensystem.io>
Maintainer: Zen Blockchain Foundation <info@zensystem.io>
Homepage: https://zensystem.io
Build-Depends: autoconf, automake, bsdmainutils, build-essential,
git, g++-multilib, libc6-dev, libtool,
Expand Down
10 changes: 6 additions & 4 deletions contrib/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
Upstream-Name: Zcash
Upstream-Contact: Zcash Company <team@z.cash>
Source: https://github.com/zcash/zcash
Upstream-Name: ZenCash
Upstream-Contact: ZenCash Team <info@zensystem.io>
Source: https://github.com/zencashofficial/zen

Files: *
Copyright: 2016-2017, The Zcash developers
Copyright: 2016-2017, The Zen Blockchain Foundation
2016-2017, The Zcash developers
2009-2017, Bitcoin Core developers
License: Expat
Comment: The Bitcoin Core developers encompasses the current developers listed on bitcoin.org,
as well as the numerous contributors to the project.
The Zcash developers are listed at https://z.cash/team.html.
The ZenCash developers are listed at https://zensystem.io/team.

Files: depends/sources/libsodium-*.tar.gz
Copyright: 2013-2016 Frank Denis
Expand Down
4 changes: 3 additions & 1 deletion doc/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ Review the automated changes in git:

Push the resulting branch to github:

$ git push 'git@github.com:$YOUR_GITHUB_NAME/zcash' $(git rev-parse --abbrev-ref HEAD)
export DEBVERSION="${ZCASH_RELEASE}"
export DEBEMAIL="${DEBEMAIL:-info@zensystem.io}"
export DEBFULLNAME="${DEBFULLNAME:-Zcash Company}"

Then create the PR on github. Complete the standard review process,
then merge, then wait for CI to complete.
Expand Down

0 comments on commit 100579b

Please sign in to comment.