diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-04-11 12:00:41 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-04-11 12:00:41 +0200 |
commit | 8ac80188472e8cf6889a6e4aeac2d09cdd19d630 (patch) | |
tree | ae825c60d301b913852353bef60af07f784fcf1b /CREDITS | |
parent | 97f0c7adf18ac02fa7e610fca19bf2a91455a06f (diff) | |
parent | 921870d54091f399cd2b129db19530cc486b5700 (diff) | |
download | psutil-8ac80188472e8cf6889a6e4aeac2d09cdd19d630.tar.gz |
Merge branch 'master' of github.com:giampaolo/psutil
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -607,3 +607,8 @@ I: 1471 N: Samer Masterson W: https://github.com/samertm I: 1480 + +N: Ammar Askar +E: ammar@ammaraskar.com +W: http://ammaraskar.com/ +I: 604, 1484
\ No newline at end of file |