ca prop 64 grow limits

With prop 64 having passed, I am somewhat confused as to the effects of the new laws and how they relate to those put in place by Prop 215. The new law now allows 100 square feet of canopy/6 plants per home for any adult over 21, however, my city has always, and continues to, allow 25 square...