diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-02-16 15:05:46 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-02-16 15:05:55 +0100 |
| commit | afae75fd3dad48b7a5db72732141d421c6864b9b (patch) | |
| tree | da1b8a35399fa0137a9dff85f67a9b2b5315d759 /contrib | |
| parent | Merge #9763: [Trivial] Update comments referencing main.cpp (diff) | |
| parent | Fix typo and spelling inconsistency in CONTRIBUTING.md (diff) | |
| download | discoin-afae75fd3dad48b7a5db72732141d421c6864b9b.tar.xz discoin-afae75fd3dad48b7a5db72732141d421c6864b9b.zip | |
Merge #9675: Fix typo and spelling inconsistency in CONTRIBUTING.md
36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/README.md | 2 | ||||
| -rw-r--r-- | contrib/devtools/README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/README.md b/contrib/README.md index 4ea9700f5..6f750106e 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -3,7 +3,7 @@ Repository Tools ### [Developer tools](/contrib/devtools) ### Specific tools for developers working on this repository. -Contains the script `github-merge.py` for merging github pull requests securely and signing them using GPG. +Contains the script `github-merge.py` for merging GitHub pull requests securely and signing them using GPG. ### [Verify-Commits](/contrib/verify-commits) ### Tool to verify that every merge commit was signed by a developer using the above `github-merge.py` script. diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index 34f2af686..67c5e15a1 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -125,7 +125,7 @@ check or whatever). This means that there are no potential race conditions (where a pullreq gets updated while you're reviewing it, but before you click -merge), and when using GPG signatures, that even a compromised github +merge), and when using GPG signatures, that even a compromised GitHub couldn't mess with the sources. Setup |