Javi Rueda f5c1068052 Merge branch 'master' of https://github.com/lbryio/lbry-android ... # Conflicts: # app/src/main/java/io/lbry/browser/MainActivity.java		2020-09-21 13:35:51 +02:00
..
src	Merge branch 'master' of https://github.com/lbryio/lbry-android	2020-09-21 13:35:51 +02:00
.gitignore	Native rewrite (#878)	2020-05-23 07:49:00 +01:00
build.gradle	Merge branch 'master' of https://github.com/lbryio/lbry-android	2020-09-21 13:35:51 +02:00
google-services.json.secret	Instant verification (#974)	2020-08-19 17:23:35 +01:00
google-services.sample.json	include google-services.sample.json for test / debug builds	2020-03-02 16:41:10 +01:00
proguard-rules.pro	Native rewrite (#878)	2020-05-23 07:49:00 +01:00
twitter.properties.secret	Instant verification (#974)	2020-08-19 17:23:35 +01:00