Updating datastore demo for client pattern. #1053
Merged
2EDA
8000