Voters approve San Antonio City Charter amendments