Len Chan a053b9443a Merge branch 'develop' of https://framagit.org/tom79/fedilab into develop ... # Conflicts: # app/src/main/res/values/strings.xml		2019-07-04 00:52:11 +08:00
..
fedilab/android	Merge branch 'develop' of https://framagit.org/tom79/fedilab into develop	2019-07-04 00:52:11 +08:00