summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNils Gillmann <gillmann@gnunet.org>2018-05-23 10:24:02 +0000
committerNils Gillmann <gillmann@gnunet.org>2018-05-23 10:24:02 +0000
commit97f0e8cf8585325401b9d19e433131722f978984 (patch)
tree935fa45929a646222b5abdd260a7bfd4be2cd836 /scripts
parent422f18ebe7ad2cbcd5d45ed05ae02e959e4a7d8b (diff)
parentcb013830383f1ccc9757aba36bc32df5ec281c02 (diff)
downloadgnurl-97f0e8cf8585325401b9d19e433131722f978984.tar.gz
gnurl-97f0e8cf8585325401b9d19e433131722f978984.tar.bz2
gnurl-97f0e8cf8585325401b9d19e433131722f978984.zip
Merge tag 'curl-7_60_0' (with fixes)
curl 7.60.0 Signed-off-by: Nils Gillmann <gillmann@gnunet.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/contributors.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/contributors.sh b/scripts/contributors.sh
index db7aab8e0..d37c1199e 100755
--- a/scripts/contributors.sh
+++ b/scripts/contributors.sh
@@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 2013-2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 2013-2018, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -50,6 +50,7 @@ cut -d: -f2- | \
cut '-d(' -f1 | \
cut '-d<' -f1 | \
tr , '\012' | \
+sed 's/ at github/ on github/' | \
sed 's/ and /\n/' | \
sed -e 's/^ //' -e 's/ $//g' -e 's/@users.noreply.github.com$/ on github/'