Nikhil Nandagopal
|
29cf9bb450
|
Merge branch 'release' into feature/basic-styling
# Conflicts:
# src/constants/ActionConstants.tsx
# src/constants/WidgetConstants.tsx
# src/editorComponents/CheckboxComponent.tsx
# src/editorComponents/RadioGroupComponent.tsx
# src/mockResponses/WidgetCardsPaneResponse.tsx
# src/pages/Editor/Canvas.tsx
# src/pages/Editor/EditorDragLayer.tsx
# src/reducers/entityReducers/index.tsx
# src/reducers/index.tsx
# src/utils/WidgetRegistry.tsx
# src/widgets/BaseWidget.tsx
# src/widgets/BreadcrumbsWidget.tsx
# src/widgets/ButtonWidget.tsx
# src/widgets/CalloutWidget.tsx
# src/widgets/CheckboxWidget.tsx
# src/widgets/IconWidget.tsx
# src/widgets/InputGroupWidget.tsx
# src/widgets/NumericInputWidget.tsx
# src/widgets/RadioGroupWidget.tsx
# src/widgets/TagInputWidget.tsx
# src/widgets/TextWidget.tsx
|
2019-09-13 16:15:49 +05:30 |
|