search

womenhackfornonprofits / whfnp

Women Hack for Non-Profits Website Overhaul
18 stars 7 forks source link

Bootstrap path #67

Closed EChesters closed 8 years ago

EChesters commented 8 years ago

Changes include adding to the bootstrap paths as discussed earlier.

Tested locally

tanyapowell commented 8 years ago

This seems to also include all the changes you made in #65. Could you take a look?

EChesters commented 8 years ago

The Issue 57 stuff has now been merged, not sure why it's in here as well. I think I did an emergency branch off the wrong one.

tanyapowell commented 8 years ago

Fair enough. I'll leave @lili2311 to take a look at this though, because I can't deploy to dev and also unsure about the bootstrap paths myself

lili2311 commented 8 years ago

@EChesters i am hesitant to merge this as I am not sure if this will override the changes made in the other PR that was already merged, could you please raise a PR with just the path change so that we are sure what will be applied when we merge? I am afraid I don't know how git will handle this.