ganfra 604de7eebc Dagger: fix some merging issues		2019-06-28 09:35:34 +02:00
..
assets	Update open source license file	2019-06-25 09:31:45 +02:00
java/im/vector/riotredesign	Dagger: fix some merging issues	2019-06-28 09:35:34 +02:00
res	Merge branch 'develop' into feature/dagger	2019-06-27 18:56:23 +02:00
AndroidManifest.xml	Move specific classes for FDroid into FDroid variant source code	2019-06-27 10:46:04 +02:00