]> projects.mako.cc - selectricity-live/commitdiff
projects / selectricity-live / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 005f5a8)
Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live
authorBenjamin Mako Hill <mako@atdot.cc>
Sun, 17 Jun 2012 22:59:36 +0000 (18:59 -0400)
committerBenjamin Mako Hill <mako@atdot.cc>
Sun, 17 Jun 2012 22:59:36 +0000 (18:59 -0400)
Conflicts:
README
app/controllers/voter_controller.rb
app/views/layouts/_footer.rhtml


No differences found
Voting machinery for the masses!

Benjamin Mako Hill || Want to submit a patch?