diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-25 09:34:08 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-10-25 09:34:08 -0600 |
| commit | a4f16c01eb4800ceb92f51479e8b04a1e69bfc8c (patch) | |
| tree | 3fa217c74048c5465436b3489b42044455ace5f9 /tox.ini | |
| parent | f6877916d84c43a86e239e2343c6779257c8f9c7 (diff) | |
| parent | 5c233c42df00c9f1949653f41dd1d91286c8097b (diff) | |
| download | askbot-a4f16c01eb4800ceb92f51479e8b04a1e69bfc8c.tar.gz askbot-a4f16c01eb4800ceb92f51479e8b04a1e69bfc8c.tar.bz2 askbot-a4f16c01eb4800ceb92f51479e8b04a1e69bfc8c.zip | |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Conflicts:
askbot/setup_templates/settings.py
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions