Nikhil Nandagopal
|
1baff6d93c
|
Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into feature/actions
# Conflicts:
# package.json
# src/actions/pageActions.tsx
# src/actions/widgetCardsPaneActions.tsx
# src/api/Api.tsx
# src/api/ApiRequests.tsx
# src/api/ApiResponses.tsx
# src/api/WidgetCardsPaneApi.tsx
# src/constants/ActionConstants.tsx
# src/constants/ApiConstants.tsx
# src/normalizers/CanvasWidgetsNormalizer.tsx
# src/reducers/entityReducers/canvasWidgetsReducer.tsx
# src/reducers/entityReducers/index.tsx
# src/reducers/entityReducers/widgetConfigReducer.tsx.tsx
# src/reducers/index.tsx
# src/reducers/uiReducers/canvasReducer.tsx
# src/reducers/uiReducers/editorReducer.tsx
# src/reducers/uiReducers/widgetCardsPaneReducer.tsx
# src/sagas/PageSagas.tsx
# src/sagas/WidgetCardsPaneSagas.tsx
# src/sagas/index.tsx
# src/utils/AppsmithUtils.tsx
# src/widgets/AlertWidget.tsx
# src/widgets/ButtonWidget.tsx
# src/widgets/CheckboxWidget.tsx
# src/widgets/DatePickerWidget.tsx
# src/widgets/DropdownWidget.tsx
# src/widgets/RadioGroupWidget.tsx
# src/widgets/TableWidget.tsx
|
2019-09-13 17:29:45 +05:30 |
|