Browse Source

Merge branch 'master' of github.com:Squidex/squidex into feature/asset-text

# Conflicts:
#	backend/src/Squidex.Domain.Apps.Entities/Assets/AssetsFluidExtension.cs
#	backend/src/Squidex.Domain.Apps.Entities/Assets/AssetsJintExtension.cs
#	backend/src/Squidex.Infrastructure/ObjectPool/MemoryStreamPooledObjectPolicy.cs
#	backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetsFluidExtensionTests.cs
#	backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetsJintExtensionTests.cs
pull/730/head
Sebastian 5 years ago
parent
commit
9f4b7bea63
  1. 4
      app.json

4
app.json

@ -7,8 +7,8 @@
"success_url": "/",
"env": {
"DOMAIN": {
"description": "Domain name",
"value": "squidex.example.com"
"description": "The domain name under which your instance is available",
"value": "https://[YOUR-HEROKU-APPNAME].herokuapp.com"
},
"MONGO_USERNAME": {
"description": "Mongo Username, follow https://devcenter.heroku.com/articles/ormongo#open-the-dashboard to create a database named Squidex and then edit the deployment to reflect the credentials you used",

Loading…
Cancel
Save