diff options
author | ankitjavalkar | 2015-09-04 11:31:29 +0530 |
---|---|---|
committer | ankitjavalkar | 2015-09-04 18:55:15 +0530 |
commit | 3ee050fe509b83f36188566ee57b3dd16d94a8a7 (patch) | |
tree | 653fbd703850e1e12f875bc5422ec3cb809c6e07 /yaksh/demo_templates/demo_settings.py | |
parent | f5568068a34e23208fb5b2a33dd806f10aab9806 (diff) | |
download | online_test-3ee050fe509b83f36188566ee57b3dd16d94a8a7.tar.gz online_test-3ee050fe509b83f36188566ee57b3dd16d94a8a7.tar.bz2 online_test-3ee050fe509b83f36188566ee57b3dd16d94a8a7.zip |
Fix conflicts and add jquery file
Diffstat (limited to 'yaksh/demo_templates/demo_settings.py')
0 files changed, 0 insertions, 0 deletions