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

..

activity

Merge branch 'develop' into Login

2018-12-26 20:19:21 +01:00

adapter

Master codebase marged

2018-12-24 16:12:25 +05:30

fragment

- Video speed UI improvements

2018-12-26 16:15:34 +01:00

helper

Master codebase marged

2018-12-24 16:12:25 +05:30

intents

- Share ability

2018-12-15 14:24:11 +01:00

model

Merge branch 'develop' into Login

2018-12-26 20:19:21 +01:00

network

- WiP

2018-12-17 18:11:41 +01:00

provider

- Implemented basic search

2018-11-10 22:40:27 +01:00

service

- Android playback control

2018-12-26 20:01:29 +01:00