diff options
| author | prathamesh | 2016-10-04 17:22:20 +0530 |
|---|---|---|
| committer | prathamesh | 2016-10-04 17:22:20 +0530 |
| commit | 9c14e2b2026074234d9c977ca17b0c96b0789f6b (patch) | |
| tree | 8b6c8e2438563e56631c2adf986e7cb16c33afb4 /setup.cfg | |
| parent | c5ae3d4589a71c3f3b9f622c7b67a04277269cde (diff) | |
| parent | 91dd42214ba5ad88c5158b50a7746caa3841a883 (diff) | |
| download | online_test-9c14e2b2026074234d9c977ca17b0c96b0789f6b.tar.gz online_test-9c14e2b2026074234d9c977ca17b0c96b0789f6b.tar.bz2 online_test-9c14e2b2026074234d9c977ca17b0c96b0789f6b.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into edit_questionpaper
Resolved
Conflicts:
yaksh/views.py
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions