jnf / blinder

We use Blinder to collect and review responses to event RFPs.
MIT License
6 stars 8 forks source link

Cucumber stuff, otra vez. #10

Closed brennx0r closed 10 years ago

brennx0r commented 10 years ago

I have pulled from upstream master and merged the conflicts.

jnf commented 10 years ago

Nice!

jnf commented 10 years ago

Can you delete the .orig files? We won't need them after the merge. :)

brennx0r commented 10 years ago

D'oh! Removed *.orig files.

jnf commented 10 years ago

:heart: :heart: :heart: