Christian Schabesberger c8d94f541f resolved merge conflict		2016-01-05 21:50:25 +01:00
..
src	resolved merge conflict	2016-01-05 21:50:25 +01:00
.gitignore	New version number 0.6.0 and some fixes:	2015-11-10 20:51:39 +01:00
build.gradle	adjusted orbot support and moved on to 0.7.2	2016-01-04 00:10:51 +01:00
proguard-rules.pro	first commit	2015-09-04 02:15:03 +02:00