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
..
array.xml	- Themes and Darkmode	2018-12-21 21:59:10 +01:00
attrs.xml	- Themes and Darkmode	2018-12-21 21:59:10 +01:00
colors.xml	- Added options menu to video playback	2018-12-25 14:22:16 +01:00
dimens.xml	Added another activity to test torrent video playing	2018-03-04 21:04:32 +01:00
ic_launcher_background.xml	- Adaptive icon	2018-12-18 20:44:23 +01:00
strings.xml	Merge branch 'develop' into Login	2018-12-26 20:19:21 +01:00
styles.xml	- Update to Androidx libs	2018-12-23 16:42:01 +01:00