diff options
| author | prathamesh | 2016-11-01 09:30:53 +0530 |
|---|---|---|
| committer | prathamesh | 2016-11-01 09:30:53 +0530 |
| commit | 6f9d5d2779e64212988c0d164fa05ce2d05e696a (patch) | |
| tree | e7a1c316b97df44ec701384feea421ca66e3aa9c /yaksh/c_cpp_files | |
| parent | 3b66e5fb8af12ce756f34966bb684373062551dd (diff) | |
| parent | f563640af941a50642dc5eb6e63b1d63a1685046 (diff) | |
| download | online_test-6f9d5d2779e64212988c0d164fa05ce2d05e696a.tar.gz online_test-6f9d5d2779e64212988c0d164fa05ce2d05e696a.tar.bz2 online_test-6f9d5d2779e64212988c0d164fa05ce2d05e696a.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into UI-modifications
Resolved
Conflicts:
yaksh/templates/manage.html
yaksh/templates/yaksh/design_questionpaper.html
Diffstat (limited to 'yaksh/c_cpp_files')
0 files changed, 0 insertions, 0 deletions