Branch: refs/heads/master
Home: https://github.com/mikemintz/deme

Commit: 564c6937020803657b8435377f4c3fc897851bf8
https://github.com/mikemintz/deme/commit/564c6937020803657b8435377f4c3fc897851bf8
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2011-09-15 (Thu, 15 Sep 2011)

Changed paths:
M deme_django/TODO

Log Message:
-----------
Added TODO note about uniqueness error


Commit: dc793bd898d28d74e3aa0275f2c0d7b2df594970
https://github.com/mikemintz/deme/commit/dc793bd898d28d74e3aa0275f2c0d7b2df594970
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2011-09-23 (Fri, 23 Sep 2011)

Changed paths:
M deme_django/TODO

Log Message:
-----------
Added TODO note


Commit: 7660ac612dd968ccd8309b542c8927839387c93e
https://github.com/mikemintz/deme/commit/7660ac612dd968ccd8309b542c8927839387c93e
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2011-09-23 (Fri, 23 Sep 2011)

Changed paths:
M deme_django/cms/templates/default_layout.html
M deme_django/modules/poll/models.py
M deme_django/modules/poll/templates/poll/approvenpoll.html
M deme_django/modules/poll/templates/poll/choosenpoll.html
M deme_django/modules/poll/templates/poll/pluralityapprovendecision.html
M deme_django/modules/poll/templates/poll/pluralitychoosendecision.html
M deme_django/modules/poll/templates/poll/thresholdapprovendecision.html
M deme_django/modules/poll/templates/poll/thresholdchoosendecision.html
M deme_django/modules/poll/templates/poll/thresholdeapprovendecision.html
M deme_django/modules/poll/templates/poll/thresholdechoosendecision.html
M deme_django/modules/poll/templates/poll/unanimouschoosendecision.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/caf8704...7660ac6