Conversations/src/main
Daniel Gultsch ee855ab560 Merge branch 'mapping' of https://github.com/SamWhited/Conversations into SamWhited-mapping 2018-04-21 16:57:53 +02:00
..
java/eu/siacs/conversations Merge branch 'mapping' of https://github.com/SamWhited/Conversations into SamWhited-mapping 2018-04-21 16:57:53 +02:00
res Merge branch 'mapping' of https://github.com/SamWhited/Conversations into SamWhited-mapping 2018-04-21 16:57:53 +02:00
AndroidManifest.xml Merge Open Street Map plugin 2018-04-16 17:39:43 -05:00