ganfra 42e0a45f3f Merge branch 'develop' into feature/read_marker		2019-10-01 13:37:21 +02:00
..
androidTest/java/im/vector/matrix/android	Merge branch 'develop' into kt-remove_java_util	2019-08-06 18:27:39 +01:00
debug/java/im/vector/matrix/android/internal/network/interceptors	Do not log big data request (ex: file upload)	2019-09-25 11:26:49 +02:00
main	Merge branch 'develop' into feature/read_marker	2019-10-01 13:37:21 +02:00
release/java/im/vector/matrix/android/internal/network/interceptors
test/java/im/vector/matrix/android/api/pushrules	Create enum for Push rules. Also add some TODOs	2019-09-20 17:50:15 +02:00