Benoit Marty ca37895619 Merge pull request #1374 from vector-im/feature/sas_v2 ... support new key agreement method for SAS		2020-05-20 18:32:01 +02:00
..
account	Deactivate account: unit test and cleanup	2020-04-22 14:36:01 +02:00
common	Merge branch 'develop' into feature/forward_pagination	2020-05-19 15:25:33 +02:00
internal	Add new key agreement protocol	2020-05-19 09:55:45 +02:00
session/room/timeline	Fix lint	2020-05-19 15:24:36 +02:00
InstrumentedTest.kt	Ensure Timber log output when running tests	2020-04-24 13:38:28 +02:00
LiveDataTestObserver.java	Optimize imports	2019-08-02 11:35:27 +02:00
MainThreadExecutor.java	Update copyright and add to last merged commits	2019-01-25 14:04:59 +01:00
OkReplayRuleChainNoActivity.kt	Fix ktlint issue automatically by running ./ktlint --android -v -F	2019-10-09 15:24:05 +02:00
SingleThreadCoroutineDispatcher.kt	Merge branch 'develop' into cross_signing	2019-12-30 14:27:47 +01:00