projects.mako.cc - selectricity-live/commit

]> projects.mako.cc - selectricity-live/commit

projects / selectricity-live / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d799e41 c5a7b7b)

author	Benjamin Mako Hill <mako@atdot.cc>
	Sun, 17 Jun 2012 22:59:36 +0000 (18:59 -0400)
committer	Benjamin Mako Hill <mako@atdot.cc>
	Sun, 17 Jun 2012 22:59:36 +0000 (18:59 -0400)
commit	005f5a86085c9cbcbc09c6655f3851a877462638
tree	6eee2d24245c098c1273bdc57d08226704048798	tree \| snapshot
parent	d799e41626ef94ab28a3b5517dd2ed7d1e6b1001	commit \| diff
parent	c5a7b7b17d7e2586a6234d1622e7babd3c0d99e0	commit \| diff

Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

Conflicts:
README
app/controllers/voter_controller.rb
app/views/layouts/_footer.rhtml

README	diff1 \|	diff2 \|	blob \| history
app/controllers/quickvote_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/voter_controller.rb	diff1 \|	diff2 \|	blob \| history
app/models/election.rb	diff1 \|	diff2 \|	blob \| history
app/models/vote.rb	diff1 \|	diff2 \|	blob \| history

Voting machinery for the masses!

Benjamin Mako Hill || Want to submit a patch?