search

chriseidhof / pomotv

http://www.pomo.tv
182 stars 29 forks source link

Add NSLondon July #117

Closed douglashill closed 8 years ago

douglashill commented 8 years ago

This is good to go, although I’m expecting to need to resolve conflicts after https://github.com/chriseidhof/pomotv/pull/116 is merged. (It ought be be merged before this because it was submitted earlier.)

chriseidhof commented 8 years ago

Oh, I thought I merged that one already, sorry!

douglashill commented 8 years ago

I’ve rebased it. Ready to go.

chriseidhof commented 8 years ago

Thanks @douglashill !