Thomas 8377f9bb8a Merge branch 'develop' into new_feature ...

# Conflicts:
#	app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
#	app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java

2020-10-06 15:32:04 +02:00

..

src

Merge branch 'develop' into new_feature

2020-10-06 15:32:04 +02:00

.gitignore

Initial commit

2020-06-25 16:57:13 +02:00

build.gradle

Merge branch 'develop' of https://framagit.org/tom79/fedilab-tube into develop

2020-10-06 15:30:53 +02:00

proguard-rules.pro

some changes

2020-06-26 18:17:17 +02:00