summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorcatherinedevlin <catherine.devlin@gmail.com>2018-05-14 16:31:19 -0400
committercatherinedevlin <catherine.devlin@gmail.com>2018-05-14 16:31:19 -0400
commitdc74a0acd004126bd3d01a0fd6f1df9acae23db1 (patch)
treef5117d4064ef6d8935e1f04609ee2d1b41e0fef1 /AUTHORS
parent3827ec514fd56ee7d395ffd63c9ed661db00606b (diff)
parent7d0f866afb714abc3510417f641e5e1384e202dc (diff)
Merge remote-tracking branch 'upstream/master' into keep_callables
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 80d91815..b0caa245 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -76,6 +76,7 @@ Contributors:
* Pierre Giraud
* Andrew Kuchling
* Catherine Devlin
+ * Jason Ribeiro
Creator: