summaryrefslogtreecommitdiffhomepage
path: root/README.markdown
diff options
context:
space:
mode:
authorSean Corrales <scorrales@usft.com>2015-10-14 14:52:37 -0500
committerSean Corrales <scorrales@usft.com>2015-10-14 14:52:37 -0500
commitfcc5086cfcac4e1efc365c16617aaf7ff9d86f80 (patch)
treeda683653842a5ae37177d191a51833f58e0b9a41 /README.markdown
parentc357be714fe39c8c97e4d1ac12b3cdfb673d1e1e (diff)
parent8ec133b29595b8dac963eafa63ab0c479e37a3c1 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'README.markdown')
-rw-r--r--README.markdown2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.markdown b/README.markdown
index 774797d5..28fa5093 100644
--- a/README.markdown
+++ b/README.markdown
@@ -8,7 +8,7 @@ commented code and explained as they go.
... to write more inline code tutorials. Just grab an existing file from
this repo and copy the formatting (don't worry, it's all very simple).
-Make a new file, send a pull request, and if it passes muster I'll get it up pronto.
+Make a new file, send a pull request, and if it passes master I'll get it up pronto.
Remember to fill in the "contributors" fields so you get credited
properly!