summaryrefslogtreecommitdiffstats
path: root/sql_scripts/cnprog_new_install.sql
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2010-02-09 15:06:29 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2010-02-09 15:06:29 -0600
commitd276802efa5899ccb568de1b4c445d54ea72c42d (patch)
tree8026f29a4b6bd794d1e8cb9a34aaa7ea29cea225 /sql_scripts/cnprog_new_install.sql
parent8de2b9131ddcef647799cf8e1e79921284523073 (diff)
parent81e2244eca04c02de0d7c32f0063f64f2ca3b1c4 (diff)
downloadaskbot-d276802efa5899ccb568de1b4c445d54ea72c42d.tar.gz
askbot-d276802efa5899ccb568de1b4c445d54ea72c42d.tar.bz2
askbot-d276802efa5899ccb568de1b4c445d54ea72c42d.zip
Merge branch 'evgenyfadeev/master'
Conflicts: django_authopenid/util.py forum/feed.py forum/views.py settings.py settings_local.py.dist templates/about.html templates/content/style/style.css templates/question.html templates/questions.html
Diffstat (limited to 'sql_scripts/cnprog_new_install.sql')
0 files changed, 0 insertions, 0 deletions