diff options
| author | Michael Merickel <michael@merickel.org> | 2017-04-30 02:02:26 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2017-04-30 02:02:26 -0500 |
| commit | 9c15a8eac2848cc7a81f174ecf7a6c63be323f51 (patch) | |
| tree | abf20accdb77f6127a5480bf023231c7b0b6706b /CONTRIBUTORS.txt | |
| parent | 3f14d63c009ae7f101b7aeb4525bab2dfe66fa11 (diff) | |
| parent | 87af11c5e33b8c03d57a8b571f0b152efe866af1 (diff) | |
| download | pyramid-9c15a8eac2848cc7a81f174ecf7a6c63be323f51.tar.gz pyramid-9c15a8eac2848cc7a81f174ecf7a6c63be323f51.tar.bz2 pyramid-9c15a8eac2848cc7a81f174ecf7a6c63be323f51.zip | |
Merge branch 'master' into pr/2854
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 750f6d29f..ca1f56f51 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -296,3 +296,5 @@ Contributors - Martin Frlin, 2016/12/7 - Kirill Kuzminykh, 2017/03/01 + +- Jeremy(Ching-Rui) Chen, 2017/04/19 |