Commit 4fc0d99b by Manuel Araoz

update repo name to zeppelin-solidity

parent 4323ab4b
...@@ -82,7 +82,7 @@ git checkout -b remove/some-file ...@@ -82,7 +82,7 @@ git checkout -b remove/some-file
We expect pull requests to be rebased to the master branch before merging: We expect pull requests to be rebased to the master branch before merging:
```sh ```sh
git remote add zep git@github.com:OpenZeppelin/zep-solidity.git git remote add zep git@github.com:OpenZeppelin/zeppelin-solidity.git
git pull --rebase zep master git pull --rebase zep master
``` ```
...@@ -95,11 +95,11 @@ git push origin feature/some-new-stuff ...@@ -95,11 +95,11 @@ git push origin feature/some-new-stuff
git push origin fix/some-bug git push origin fix/some-bug
``` ```
Finally go to [github.com/OpenZeppelin/zep-solidity](https://github.com/OpenZeppelin/zep-solidity) in your web browser and issue a new pull request. Finally go to [github.com/OpenZeppelin/zeppelin-solidity](https://github.com/OpenZeppelin/zeppelin-solidity) in your web browser and issue a new pull request.
Main contributors will review your code and possibly ask for changes before your code is pulled in to the main repository. We'll check that all tests pass, review the coding style, and check for general code correctness. If everything is OK, we'll merge your pull request and your code will be part of Zeppelin. Main contributors will review your code and possibly ask for changes before your code is pulled in to the main repository. We'll check that all tests pass, review the coding style, and check for general code correctness. If everything is OK, we'll merge your pull request and your code will be part of Zeppelin.
If you have any questions feel free to post them to If you have any questions feel free to post them to
[github.com/OpenZeppelin/zep-solidity/issues](https://github.com/OpenZeppelin/zep-solidity/issues). [github.com/OpenZeppelin/zeppelin-solidity/issues](https://github.com/OpenZeppelin/zeppelin-solidity/issues).
Thanks for your time and code! Thanks for your time and code!
...@@ -29,7 +29,7 @@ contract MetaCoin is Rejector { ...@@ -29,7 +29,7 @@ contract MetaCoin is Rejector {
} }
``` ```
> NOTE: The current distribution channel is npm, which is not ideal. [We're looking into providing a better tool for code distribution](https://github.com/OpenZeppelin/zep-solidity/issues/13), and ideas are welcome. > NOTE: The current distribution channel is npm, which is not ideal. [We're looking into providing a better tool for code distribution](https://github.com/OpenZeppelin/zeppelin-solidity/issues/13), and ideas are welcome.
#### Truffle Beta Support #### Truffle Beta Support
We also support Truffle Beta npm integration. If you're using Truffle Beta, the contracts in `node_modules` will be enough, so feel free to delete the copies at your `contracts` folder. If you're using Truffle Beta, you can use Zeppelin contracts like so: We also support Truffle Beta npm integration. If you're using Truffle Beta, the contracts in `node_modules` will be enough, so feel free to delete the copies at your `contracts` folder. If you're using Truffle Beta, you can use Zeppelin contracts like so:
...@@ -58,11 +58,11 @@ Building a distributed application, protocol or organization with Zeppelin? ...@@ -58,11 +58,11 @@ Building a distributed application, protocol or organization with Zeppelin?
Interested in contributing to Zeppelin? Interested in contributing to Zeppelin?
- Framework proposal and roadmap: https://medium.com/zeppelin-blog/zeppelin-framework-proposal-and-development-roadmap-fdfa9a3a32ab#.iain47pak - Framework proposal and roadmap: https://medium.com/zeppelin-blog/zeppelin-framework-proposal-and-development-roadmap-fdfa9a3a32ab#.iain47pak
- Issue tracker: https://github.com/OpenZeppelin/zep-solidity/issues - Issue tracker: https://github.com/OpenZeppelin/zeppelin-solidity/issues
- Contribution guidelines: https://github.com/OpenZeppelin/zep-solidity/blob/master/CONTRIBUTING.md - Contribution guidelines: https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/CONTRIBUTING.md
## Contracts ## Contracts
TODO TODO
## License ## License
Code released under the [MIT License](https://github.com/OpenZeppelin/zep-solidity/blob/master/LICENSE). Code released under the [MIT License](https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/LICENSE).
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment