Code fixes, staff updates (Amber & Angela), VISTA blog post

thinkshout / feeding-texas

Home of the Feeding Texas website. Development by ThinkShout.

feedingtexas.org

5 stars 12 forks source link

Closed jcdwyer1 closed 9 years ago

jcdwyer1 commented 9 years ago

@heypaxton Can you resolve the conflict(s) referenced below via command line?

heypaxton commented 9 years ago

@jcdwyer1 this has been merged.