diff options
| author | prathamesh | 2017-10-26 14:46:14 +0530 |
|---|---|---|
| committer | prathamesh | 2017-10-26 14:46:14 +0530 |
| commit | 8dc6f2c9271e2e2aef9c30594df85af8b24aeeb4 (patch) | |
| tree | d3c9d2ef6afbfb5307fb2b4b9e867253da98eacf /setup.py | |
| parent | 1f554e7505f5a6aa1b796b2e31e1541188af56da (diff) | |
| parent | 840c00b9e939d2b33058d236ef4170923e0a018b (diff) | |
| download | online_test-8dc6f2c9271e2e2aef9c30594df85af8b24aeeb4.tar.gz online_test-8dc6f2c9271e2e2aef9c30594df85af8b24aeeb4.tar.bz2 online_test-8dc6f2c9271e2e2aef9c30594df85af8b24aeeb4.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into detailed_csv_download_quiz
RESOLVED
Conflicts:
yaksh/test_models.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -19,6 +19,8 @@ install_requires = [ 'pytz==2016.4', 'python-social-auth==0.2.19', 'tornado', + 'psutil', + 'ruamel.yaml==0.15.23' ] setup( |