Resolve missing code merge on Explore Page

peacecorps / Opportunity-Portal

CLOSED - Giving potential applicants a view into the Volunteer opportunities available, along with additional data to make an informed decision to join Peace Corps.

9 stars 6 forks source link

Resolve missing code merge on Explore Page #28

Open Mc4llister opened 10 years ago

Mc4llister commented 10 years ago

@jkevintu Please re-add you're code by branching and re-adding the image files that were dropped. Also involved: @kststudio and @mhkane

screen shot 2014-05-28 at 7 24 24 pm

mhkane commented 10 years ago

I think Kevin did the right modification and I changed one word in the document. It looks good to me on the Google App engine

jkevintu commented 10 years ago

The images were not showing correctly not because of the wrong merge but capital file names.

Mc4llister commented 10 years ago

Reopening this ticket to check that we didn't mess up a recent merge. Patrick, I saw you accepted a code merge from @mhkane, #33. But it looks like that pull request was from a while ago. I don't see any deletions in the revision code, but want to just check we didn't walk back the master branch? Can someone verify?

Are we agreed pull requests are managed by @slgill and @sshami?