diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-05-08 09:22:15 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-05-08 09:22:15 -0600 |
| commit | 26c744a5ad350d46b07c7cb9ad1b30a0cb05f4d8 (patch) | |
| tree | 5a3cb6d5b4668632752712875f60a448eb3becb0 /setup.py | |
| parent | a7a8df8ad46d727cd16506f244bee4ba5d35d3dc (diff) | |
| parent | 1ac6ed4e82f2b61c478b7cb3d863a4fa8b42418a (diff) | |
| download | askbot-26c744a5ad350d46b07c7cb9ad1b30a0cb05f4d8.tar.gz askbot-26c744a5ad350d46b07c7cb9ad1b30a0cb05f4d8.tar.bz2 askbot-26c744a5ad350d46b07c7cb9ad1b30a0cb05f4d8.zip | |
Merge branch 'evgeny' into byron
Conflicts:
askbot/cron/askbot_cron_job
askbot/skins/default/media/style/style.css
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions