5 Commits

Author SHA1 Message Date
Stefan Schueller
8175956bc0 Merge branch 'develop' into Login
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/net/schueller/peertube/activity/LoginActivity.java
#	app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
#	app/src/main/res/values/strings.xml
2018-12-26 20:19:21 +01:00
mgdx
a1bafa7c1f French translation completed 2018-12-24 01:19:57 +01:00
Paul
8948eeac9b French translation completed 2018-12-18 21:29:41 +01:00
Stefan Schueller
67fcb14b0c - WiP 2018-12-17 18:11:41 +01:00
Paul
b2c93eace6 [Translation] Strings translated to french 2018-11-29 15:14:20 +01:00