Merge branch 'master' into keychain

This commit is contained in:
ouwou 2022-12-01 20:00:44 -05:00
commit 9ae41b7335
2 changed files with 68 additions and 67 deletions

View File

@ -160,7 +160,7 @@ jobs:
cd deps cd deps
git clone https://github.com/nlohmann/json git clone https://github.com/nlohmann/json
cd json cd json
git checkout db78ac1d7716f56fc9f1b030b715f872f93964e4 git checkout bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
mkdir build mkdir build
cd build cd build
cmake .. cmake ..

View File

@ -240,6 +240,7 @@ For example, memory_db would be set by adding `memory_db = true` under the line
* **`token`** (string) - Discord token used to login, this can be set from the menu * **`token`** (string) - Discord token used to login, this can be set from the menu
* **`prefetch`** (true or false, `default: false`) - if true, new messages will cause the avatar and image attachments to be * **`prefetch`** (true or false, `default: false`) - if true, new messages will cause the avatar and image attachments to be
automatically downloaded automatically downloaded
* **`autoconnect`** (true or false, `default: false`) - autoconnect to discord
#### http #### http