Anthony Restaino 240c9a5a37 Merge remote-tracking branch 'origin/master' into dev ...

Conflicts:
	app/src/main/res/values-fr/strings.xml

2015-07-29 21:44:33 -04:00

..

src

Merge remote-tracking branch 'origin/master' into dev

2015-07-29 21:44:33 -04:00

.gitignore

Utilize gradle product flavors to produce free and plus versions

2015-05-25 12:55:35 -04:00

app.iml

Added Bookmark folders, Added actions to the bookmark drawer, + other

2015-07-25 10:19:14 -04:00

build.gradle

Updated ProxyUtils to automatically start TOR when needed, more abstraction of BrowserActivity, other cleanup

2015-07-19 15:36:41 -04:00

proguard-project.txt

Added Bookmark folders, Added actions to the bookmark drawer, + other

2015-07-25 10:19:14 -04:00