Merge branch 'dbkr/wrong_comment_breaks_everything' into 'master'

Fix comment and also js build

See merge request matrix-org/olm!7
This commit is contained in:
Hubert Chathi 2019-09-30 13:08:23 +00:00
commit 44c2e47a3e

View file

@ -152,7 +152,7 @@ size_t olm_pickle_pk_decryption_length(
/** Stores decryption object as a base64 string. Encrypts the object using the
* supplied key. Returns the length of the pickled object on success.
* Returns olm_error() on failure. If the pickle output buffer
* is smaller than olm_pickle_decryption_length() then
* is smaller than olm_pickle_pk_decryption_length() then
* olm_pk_decryption_last_error() will be "OUTPUT_BUFFER_TOO_SMALL" */
size_t olm_pickle_pk_decryption(
OlmPkDecryption * decryption,