diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-12-13 07:58:52 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-12-13 07:58:52 +0900 |
commit | b4aa613c82aabd0082dd68c1cf2e1598c19bb73e (patch) | |
tree | 45dcde9782ee035bd2fbea010df9eef16338e14d /lib/csapi/joining.h | |
parent | cda9a0f02cc3e779da378d0328f9d24c708b2600 (diff) | |
parent | 8dcda23ed210151904c9137067626eddae683822 (diff) | |
download | libquotient-b4aa613c82aabd0082dd68c1cf2e1598c19bb73e.tar.gz libquotient-b4aa613c82aabd0082dd68c1cf2e1598c19bb73e.zip |
Merge branch 'kitsune-omittable-bool' into kitsune-lazy-loading
Diffstat (limited to 'lib/csapi/joining.h')
-rw-r--r-- | lib/csapi/joining.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/csapi/joining.h b/lib/csapi/joining.h index 137afbfc..52c8ea42 100644 --- a/lib/csapi/joining.h +++ b/lib/csapi/joining.h @@ -59,7 +59,7 @@ namespace QMatrixClient // Result properties - /// The joined room id + /// The joined room ID. const QString& roomId() const; protected: @@ -138,7 +138,7 @@ namespace QMatrixClient // Result properties - /// The joined room id + /// The joined room ID. const QString& roomId() const; protected: |