Branch: refs/heads/master
Home: https://github.com/mikemintz/deme
Commit: a2086a7ad6e1576245e7f60e4623382ea174ba0f
https://github.com/mikemintz/deme/commit/a2086a7ad6e1576245e7f60e4623382ea174ba0f
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2012-01-26 (Thu, 26 Jan 2012)

Changed paths:
M deme_django/modules/community_forum/templates/discussionboard/show.html
M deme_django/modules/community_forum/templatetags/air_extras.py
M deme_django/modules/community_forum/views.py

Log Message:
-----------
More work on discussion board viewer.


Commit: 160ed0d59fd16cc8563ed81c59c8f033428c14bd
https://github.com/mikemintz/deme/commit/160ed0d59fd16cc8563ed81c59c8f033428c14bd
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2012-01-26 (Thu, 26 Jan 2012)

Changed paths:
M deme_django/modules/poll/models.py
A deme_django/modules/poll/templates/poll/OldapproveNPoll
A deme_django/modules/poll/templates/poll/ResultsPage.html
M deme_django/modules/poll/templates/poll/approvenpoll.html
M deme_django/modules/poll/views.py

Log Message:
-----------
Merge branch 'master' of github.com:mikemintz/deme


Compare: https://github.com/mikemintz/deme/compare/3065134...160ed0d