diff options
| author | prathamesh | 2014-09-12 14:04:56 +0530 |
|---|---|---|
| committer | prathamesh | 2014-09-12 14:04:56 +0530 |
| commit | 1890c4ce21bf96ff1792559096d4358c084d1bfe (patch) | |
| tree | 7d640df203790c5a10b1047e6f7bf5c8ea0ecfbe /tbc/static/js/tests/vendor/qunit.css | |
| parent | ae98173c413c40e68df3d538dd27e7f3f6c43503 (diff) | |
| parent | 9e164679671c03383f21cb0a2ccc72c6176dc074 (diff) | |
| download | Python-TBC-Interface-1890c4ce21bf96ff1792559096d4358c084d1bfe.tar.gz Python-TBC-Interface-1890c4ce21bf96ff1792559096d4358c084d1bfe.tar.bz2 Python-TBC-Interface-1890c4ce21bf96ff1792559096d4358c084d1bfe.zip | |
Merge branch 'Proposal' of https://github.com/FOSSEE/Python-TBC-Interface into log_activities_extension
Conflicts:
tbc/views.py
Diffstat (limited to 'tbc/static/js/tests/vendor/qunit.css')
0 files changed, 0 insertions, 0 deletions