Merged
requested to merge github/fork/rohit2sharma95/master-jo-base-component into master-jo-base-component
Created by: rohit2sharma95
Because the data is now being set in the base component
Created by: rohit2sharma95
Because the data is now being set in the base component