City council passes short-term rental bill