torrentcome b6d4b388a5 Merge branch 'master' into #142/SaveToots ... # Conflicts: # app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java		2017-07-07 13:28:31 +02:00
..
src	Merge branch 'master' into #142/SaveToots	2017-07-07 13:28:31 +02:00
.gitignore	Adds a forgotten keystore.	2017-06-02 04:47:22 -04:00
build.gradle	Merge branch 'master' into #142/SaveToots	2017-07-07 13:28:31 +02:00
proguard-rules.pro	(proguard) add forgoten rule for jsoup in release	2017-06-08 14:39:48 +02:00