diff options
| author | prathamesh | 2014-11-28 14:17:00 +0530 |
|---|---|---|
| committer | prathamesh | 2014-11-28 14:17:00 +0530 |
| commit | ec7d9c71d352b9e0760250debc7274b439bc32ba (patch) | |
| tree | d5402453ce5ea7c280203cf2eee3d3f887221425 /tbc/static/js/bootstrap-carousel.js | |
| parent | a1e409925163204f83988c7aeeb668bc10f5a8dd (diff) | |
| parent | 4d1880d9a5bfe0b56d2f067479d48703a1a3e476 (diff) | |
| download | Python-TBC-Interface-ec7d9c71d352b9e0760250debc7274b439bc32ba.tar.gz Python-TBC-Interface-ec7d9c71d352b9e0760250debc7274b439bc32ba.tar.bz2 Python-TBC-Interface-ec7d9c71d352b9e0760250debc7274b439bc32ba.zip | |
Merge branch 'master' into certificate_generation
Conflicts:
tbc/views.py
Diffstat (limited to 'tbc/static/js/bootstrap-carousel.js')
0 files changed, 0 insertions, 0 deletions