diff options
| author | prathamesh | 2018-01-02 22:09:44 +0530 |
|---|---|---|
| committer | prathamesh | 2018-01-02 22:09:44 +0530 |
| commit | 44e16651a9f7faec95a32c19738a996a731ae57a (patch) | |
| tree | 0aa8439547b0f1281ab78964aaf3f7ad176ed6da /yaksh/language_registry.py | |
| parent | e14514e01052fb36cd9f14675cbe7ca940945a34 (diff) | |
| parent | e566d54239efcb46f253e324b7295a676378f656 (diff) | |
| download | online_test-44e16651a9f7faec95a32c19738a996a731ae57a.tar.gz online_test-44e16651a9f7faec95a32c19738a996a731ae57a.tar.bz2 online_test-44e16651a9f7faec95a32c19738a996a731ae57a.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into exercise
Conflicts Resolved:
yaksh/templates/yaksh/courses.html
yaksh/templates/yaksh/question.html
Diffstat (limited to 'yaksh/language_registry.py')
0 files changed, 0 insertions, 0 deletions