diff options
| author | prathamesh | 2016-09-23 13:15:06 +0530 |
|---|---|---|
| committer | prathamesh | 2016-09-23 13:15:06 +0530 |
| commit | d4a0ace8042f590659b8e7ec02fcdc3a24fe0592 (patch) | |
| tree | fe804651f57ba0e364a11d1719edcf3d260f5ebe /setup.py | |
| parent | 03e54d7f6a42c0d9207db554abba9da854d494e4 (diff) | |
| parent | 8e4ead8ab4caa9366e5357840e1912cbfb8cdb85 (diff) | |
| download | online_test-d4a0ace8042f590659b8e7ec02fcdc3a24fe0592.tar.gz online_test-d4a0ace8042f590659b8e7ec02fcdc3a24fe0592.tar.bz2 online_test-d4a0ace8042f590659b8e7ec02fcdc3a24fe0592.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into regrade_papers
Resolved
Conflicts:
yaksh/models.py
yaksh/test_models.py
yaksh/urls.py
yaksh/views.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions