diff options
| author | prathamesh | 2017-09-01 17:22:29 +0530 |
|---|---|---|
| committer | prathamesh | 2017-09-01 17:22:29 +0530 |
| commit | 1e3bb9e325214be0105f8b907badc84b2dbbeb91 (patch) | |
| tree | 3327924e1879524909d5f1603dfe7d3dbda4c05a /yaksh/fixtures | |
| parent | e2c65655dcdc5558cfb4ab668c3012024d27ac75 (diff) | |
| parent | 9e0f737c25a5156aa884d27357af0aef1145c4b7 (diff) | |
| download | online_test-1e3bb9e325214be0105f8b907badc84b2dbbeb91.tar.gz online_test-1e3bb9e325214be0105f8b907badc84b2dbbeb91.tar.bz2 online_test-1e3bb9e325214be0105f8b907badc84b2dbbeb91.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into improve-code-server
Conflicts Resolved:
yaksh/templates/yaksh/question.html
Diffstat (limited to 'yaksh/fixtures')
| -rw-r--r-- | yaksh/fixtures/demo_questions.zip | bin | 4430 -> 3055 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/yaksh/fixtures/demo_questions.zip b/yaksh/fixtures/demo_questions.zip Binary files differindex c68e7ef..4e86485 100644 --- a/yaksh/fixtures/demo_questions.zip +++ b/yaksh/fixtures/demo_questions.zip |