Benoit Marty c0c300925d Merge branch 'develop' into feature/fix_1543		2020-06-24 21:24:25 +02:00
..
androidTest/java/im/vector/riotx	Emoji completion 🎉 does not completes to 🎉 like on web (#1285)	2020-04-28 14:29:43 +02:00
debug	revert test code	2020-06-19 13:36:16 +02: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 branch 'develop' into feature/fix_1543	2020-06-24 21:24:25 +02:00
release	Fix warning on release build	2019-10-09 16:47:27 +02:00
sharedTest/java/im/vector/riotx/test/shared	Add Android test for EmojiDataSource	2020-04-28 14:15:50 +02:00
test/java/im/vector/riotx	Fix build and add tests	2020-01-29 09:44:53 +01:00