diff options
| author | prathamesh | 2017-09-01 17:50:14 +0530 |
|---|---|---|
| committer | prathamesh | 2017-09-01 17:50:14 +0530 |
| commit | 82b71b1500dfee256c41f64c34c3a753d151f08e (patch) | |
| tree | b0148bc65fc6a153dc04ce9d416f1ccfc4878824 /manage.py | |
| parent | 1e3bb9e325214be0105f8b907badc84b2dbbeb91 (diff) | |
| parent | 97a96d1678cb55b95ed14eb9a2b2790415d30abc (diff) | |
| download | online_test-82b71b1500dfee256c41f64c34c3a753d151f08e.tar.gz online_test-82b71b1500dfee256c41f64c34c3a753d151f08e.tar.bz2 online_test-82b71b1500dfee256c41f64c34c3a753d151f08e.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into improve-code-server
Conflicts Resolved:
.travis.yml
yaksh/views.py
Diffstat (limited to 'manage.py')
0 files changed, 0 insertions, 0 deletions