summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorAmjith Ramanujam <amjith.r@gmail.com>2018-05-17 05:57:46 -0700
committerGitHub <noreply@github.com>2018-05-17 05:57:46 -0700
commit0643fd65346ba6fa5620f5d15d2554a8ce019027 (patch)
tree0018a7d7bb298d2b844632f103941c968ee6064a /AUTHORS
parent51138b43d44b7cf1c7ca657c130930cc0b0a586e (diff)
parent8e12ea5e0fd32dc5ef3b757d555c9ce1fa5123bf (diff)
Merge branch 'master' into master
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 611d40c5..74bf99d5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -76,6 +76,8 @@ Contributors:
* Pierre Giraud
* Andrew Kuchling
* Dan Clark
+ * Catherine Devlin
+ * Jason Ribeiro
Creator: