search

wics-uw / website

The code that runs http://wics.uwaterloo.ca/
Other
9 stars 49 forks source link

Updates contact and FAQ page with feedback form; fixes issue #214 #242

Closed zarinaaa closed 8 years ago

evykassirer commented 8 years ago

this was on your master branch! ask on wics-sys how to move your changes to a feature branch :)

(not the end of the world - but better fixed)

evykassirer commented 8 years ago

also you need to rebase off of upstream/master (see the instructions in the PR I opened to add stuff to the readme) because this change conflicts with another recent change (your change actually! when you added reading resources to the faq)

evykassirer commented 8 years ago

the changes themselves look great though! thanks for adding this, I think it's a really good feature to have on our site