Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
This commit is contained in:
commit
118a50b894
2 changed files with 1 additions and 2 deletions
|
@ -1482,7 +1482,7 @@ $commonCollections = [
|
||||||
[
|
[
|
||||||
'$id' => ID::custom('_key_default_type'),
|
'$id' => ID::custom('_key_default_type'),
|
||||||
'type' => Database::INDEX_KEY,
|
'type' => Database::INDEX_KEY,
|
||||||
'attributes' => ['default, type'],
|
'attributes' => ['default','type'],
|
||||||
'lengths' => [],
|
'lengths' => [],
|
||||||
'orders' => [Database::ORDER_ASC],
|
'orders' => [Database::ORDER_ASC],
|
||||||
],
|
],
|
||||||
|
|
|
@ -257,7 +257,6 @@ Config::load('storage-logos', __DIR__ . '/config/storage/logos.php');
|
||||||
Config::load('storage-mimes', __DIR__ . '/config/storage/mimes.php');
|
Config::load('storage-mimes', __DIR__ . '/config/storage/mimes.php');
|
||||||
Config::load('storage-inputs', __DIR__ . '/config/storage/inputs.php');
|
Config::load('storage-inputs', __DIR__ . '/config/storage/inputs.php');
|
||||||
Config::load('storage-outputs', __DIR__ . '/config/storage/outputs.php');
|
Config::load('storage-outputs', __DIR__ . '/config/storage/outputs.php');
|
||||||
Config::load('messagingProviders', __DIR__ . '/config/messagingProviders.php');
|
|
||||||
|
|
||||||
$user = App::getEnv('_APP_REDIS_USER', '');
|
$user = App::getEnv('_APP_REDIS_USER', '');
|
||||||
$pass = App::getEnv('_APP_REDIS_PASS', '');
|
$pass = App::getEnv('_APP_REDIS_PASS', '');
|
||||||
|
|
Loading…
Reference in a new issue