diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-05-12 21:24:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 21:24:15 -0700 |
| commit | 5f3b95cf3e1b3005007e739d0e008b21cff2babf (patch) | |
| tree | c69983404d7b9b8db62640809e6b81c5e46677b4 /CONTRIBUTORS.txt | |
| parent | b5444950d84c507f26764a16021db6e01d0461e3 (diff) | |
| parent | a7d60de001ba14023d20d701d9697ad7d8de1dd4 (diff) | |
| download | pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.gz pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.bz2 pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.zip | |
Merge branch 'master' into change-to-localhost
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 542b85f8e..2e49a193a 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -291,6 +291,8 @@ Contributors - Mikko Ohtamaa, 2016/12/6 +- Jure Cerjak, 2016/12/7 + - Martin Frlin, 2016/12/7 - Kirill Kuzminykh, 2017/03/01 |