A man has been charged after a "disturbance" in Edinburgh, in which two people needed hospital treatment.