Nikhil Nandgopal 9921154045 Merge branch 'master' of gitlab.com:mobtools/internal-tools-client into feature/button ... # Conflicts: # src/constants/WidgetConstants.tsx # src/mockResponses/CanvasResponse.ts # src/utils/WidgetRegistry.tsx		2019-03-18 19:32:07 +05:30
..
Canvas.tsx	added type to state	2019-02-11 23:52:23 +05:30
ComponentPane.tsx	Merge branch 'master' of gitlab.com:mobtools/internal-tools-client into feature/button	2019-03-18 19:32:07 +05:30
index.tsx	added basic routes and styled components	2019-02-07 10:37:09 +05:30