search

POSSA / freepbx-weather-by-zip

FreePBX module, reads back weather forcast from dtmf zip code input
4 stars 5 forks source link

Update master to 1.3.4 #22

Closed lgaetz closed 11 years ago

lgaetz commented 11 years ago

@tm1000 Andrew, I hate to be a pain, but the working -> master merge will not go automatically and I am not sure how to resolve conflicts. Can you deal with this for me?