Merge branch 'master' into release

Browse Source

# Conflicts:
#	app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
#	app/server/appsmith-server/src/main/resources/application.properties

...

This commit is contained in:

Arpit Mohan 2020-11-20 14:43:38 +05:30

parent 9ef9d184ff 2489754abe

commit 8929832fa2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available