projects
/
selectricity-live
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
005f5a8
)
Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live
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)
Conflicts:
README
app/controllers/voter_controller.rb
app/views/layouts/_footer.rhtml
No differences found
Benjamin Mako Hill
||
Want to submit a patch?