diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-06-10 12:50:20 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2017-06-10 12:50:20 -0700 |
| commit | 8cbd2355d45fa6b1d6495564d0c12f646b860803 (patch) | |
| tree | 80d9cbd2612597b454e13a64eb8a6f8e1641ef92 /CONTRIBUTORS.txt | |
| parent | d07c3a0e91a6f9d96e80c36e40470a83383a656c (diff) | |
| parent | a503511cf82ab1db8c66eb949eeb30da92dd621f (diff) | |
| download | pyramid-8cbd2355d45fa6b1d6495564d0c12f646b860803.tar.gz pyramid-8cbd2355d45fa6b1d6495564d0c12f646b860803.tar.bz2 pyramid-8cbd2355d45fa6b1d6495564d0c12f646b860803.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index cbee08d0d..445536e9e 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -302,3 +302,5 @@ Contributors - Jeremy(Ching-Rui) Chen, 2017/04/19 - Fang-Pen Lin, 2017/05/22 + +- Volker Diels-Grabsch, 2017/06/09 |