Stefan Schüller fbbbaf919e Merge branch 'develop' into Login ...

# Conflicts:
#	app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java

2018-12-31 20:55:19 +01:00

..

src

Merge branch 'develop' into Login

2018-12-31 20:55:19 +01:00

build.gradle

Merge branch 'develop' into Login

2018-12-31 20:55:19 +01:00

proguard-rules.pro

Init

2018-03-03 01:10:13 +01:00