a little changed
Merge branch 'master' of https://github.com/matcho3/HIKERS into trip
image added
conflict is fixed
my trip is added on header
triplist complete
my trip on the header
conflict is fixed
List your trips' error fixed
message ok
message revised
link_to
user_info
message validates
modal1
conflict fixed
modal
conflict is fixed
message complete
Merge pull request #33 from matcho3/trip

Trip