Trisha Anand
|
73757c3425
|
Merge branch 'release' into feature/acl-spring-object
# Conflicts:
# .gitignore
# appsmith-plugins/mongoPlugin/plugin.properties
# appsmith-plugins/postgresPlugin/plugin.properties
# appsmith-plugins/rapidApiPlugin/plugin.properties
# appsmith-plugins/restApiPlugin/plugin.properties
# appsmith-plugins/restApiPlugin/src/main/java/com/external/plugins/RestApiPlugin.java
# appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
# appsmith-server/src/main/java/com/appsmith/server/repositories/ActionRepository.java
# appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
# appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java
# appsmith-server/src/main/java/com/appsmith/server/services/DatasourceServiceImpl.java
# appsmith-server/src/test/java/com/appsmith/server/services/ActionServiceTest.java
# appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
# appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
# appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
# build.sh
|
2020-06-12 19:14:31 +05:30 |
|