Benoit Marty 66f6b1ecac Merge pull request #1224 from vector-im/feature/composer_shield ... Add shield in composer		2020-04-15 16:49:50 +02:00
..
debug	Merge branch 'develop' into feature/target-sdk-29	2020-04-14 13:59:54 +03:00
fdroid	Fix pusher issue. It was set by mistake when the notification for this device was disabled	2020-03-06 17:19:48 +01:00
gplay	Replace deprecated PreferenceManager with androidx version.	2020-03-26 15:56:33 +03:00
main	Merge pull request #1224 from vector-im/feature/composer_shield	2020-04-15 16:49:50 +02:00
release	Fix warning on release build	2019-10-09 16:47:27 +02:00
test/java/im/vector/riotx	Fix build and add tests	2020-01-29 09:44:53 +01:00