summaryrefslogtreecommitdiff
path: root/THANKS
diff options
context:
space:
mode:
authorsimonxu72 <simon.xu72@gmail.com>2018-11-13 13:19:13 +0800
committersimonxu72 <simon.xu72@gmail.com>2018-11-13 13:19:13 +0800
commit4014faf695c3da3a8f0c7aa088cdae0725433d16 (patch)
tree9601583c4314fd1fdca3c12d657ac54b286f9d21 /THANKS
parent41d133856bf199034b0eeb0903bedc2071fba7e1 (diff)
parentd0e9a553468424b53aeb9907201d0b4f5aa4fad2 (diff)
merge from upstream/master
Diffstat (limited to 'THANKS')
-rw-r--r--THANKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/THANKS b/THANKS
index d6e3869..e4bb872 100644
--- a/THANKS
+++ b/THANKS
@@ -140,3 +140,4 @@ Heinz N. Gies
Roberto Aloi
Andrew McRobb
Drew Varner
+Niklas Johansson