Stefan Schueller 8b3f688435 Merge branch 'develop' of https://hosted.weblate.org/git/peertube/android into develop
 Conflicts:
	app/src/main/res/values-bn/strings.xml
	app/src/main/res/values-zh-rCN/strings.xml
2020-06-01 20:25:32 +02:00
..
2019-02-16 22:55:24 +01:00
2020-06-01 19:44:35 +02:00
2019-09-25 19:03:06 +02:00
2018-12-18 20:44:23 +01:00
2019-02-16 22:55:24 +01:00
2019-02-16 22:55:24 +01:00
2019-02-16 22:55:24 +01:00
2019-02-16 22:55:24 +01:00
2019-02-16 22:55:24 +01:00
2020-06-01 19:44:35 +02:00
2020-06-01 19:44:35 +02:00
2020-01-04 21:37:59 +01:00
2020-06-01 19:44:35 +02:00
2020-01-04 21:37:59 +01:00
2019-09-25 19:03:06 +02:00
2020-06-01 19:44:35 +02:00
2019-09-25 19:03:06 +02:00
2019-03-03 00:48:33 +01:00