fbbbaf919e
# Conflicts: # app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java |
||
---|---|---|
.. | ||
array.xml | ||
attrs.xml | ||
colors.xml | ||
dimens.xml | ||
ic_launcher_background.xml | ||
strings.xml | ||
styles.xml |
fbbbaf919e
# Conflicts: # app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java |
||
---|---|---|
.. | ||
array.xml | ||
attrs.xml | ||
colors.xml | ||
dimens.xml | ||
ic_launcher_background.xml | ||
strings.xml | ||
styles.xml |