diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-10-17 12:28:53 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-10-17 12:28:53 -0600 |
| commit | 2ccd4b776a478b4e80d148bd1f3d3a8c83cda2b6 (patch) | |
| tree | 06199b13f27f8a80b840264f9e84567510c124bb /.gitignore | |
| parent | 3f42d059adaa0ae6813dc32a10e32b8ddd99d31e (diff) | |
| parent | 5d7cc5c76655e504cf79832acc418d994104c40b (diff) | |
| download | askbot-2ccd4b776a478b4e80d148bd1f3d3a8c83cda2b6.tar.gz askbot-2ccd4b776a478b4e80d148bd1f3d3a8c83cda2b6.tar.bz2 askbot-2ccd4b776a478b4e80d148bd1f3d3a8c83cda2b6.zip | |
Merge branch 'master' of git://github.com/cnprog/CNPROG into chinito/master
Conflicts:
templates/user_stats.html
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4,3 +4,5 @@ settings_local.py nbproject settings_local.py +log +*.log |