diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-08-02 13:47:01 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-08-02 13:47:01 -0600 |
| commit | 4f6a78f465de5b439ece14ffea79351572dbb75d (patch) | |
| tree | a77b7949c4a16cd7225d95ca91e75245f9097c1e /askbot_requirements.txt | |
| parent | a303250bfd22f80c90a3bcc7f5ceb8b06e8bdbb1 (diff) | |
| parent | 2a9fd69d2f53bff4130fc67badced33b52b4aa2b (diff) | |
| download | askbot-4f6a78f465de5b439ece14ffea79351572dbb75d.tar.gz askbot-4f6a78f465de5b439ece14ffea79351572dbb75d.tar.bz2 askbot-4f6a78f465de5b439ece14ffea79351572dbb75d.zip | |
Merge branch 'master' into django1.4
Conflicts:
askbot/feed.py
Diffstat (limited to 'askbot_requirements.txt')
| -rw-r--r-- | askbot_requirements.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/askbot_requirements.txt b/askbot_requirements.txt index fc11d9d1..7b619c36 100644 --- a/askbot_requirements.txt +++ b/askbot_requirements.txt @@ -1,11 +1,12 @@ akismet -django>=1.1.2 +django==1.3.1 Jinja2 Coffin>=0.3 South>=0.7.1 oauth2 +Lamson markdown2 -html5lib +html5lib==0.90 django-keyedcache django-threaded-multihost django-robots @@ -17,3 +18,4 @@ django-followit django-recaptcha-works python-openid pystache==0.3.1 +pytz |