Peter Serwylo 0e5c039536 Merge branch 'master' into new-swap ...

Fixed lots of (minor) conflicts. Some due to earlier rebasing of
material stuff that was subsequently merged into master with a
different commit hash (I guess, that's what it looked like anyway).

2015-07-27 18:42:16 +10:00

..

preferences.xml

Merge branch 'master' into new-swap

2015-07-27 18:42:16 +10:00

searchable.xml

Move F-Droid project into subdir, keeping a root gradle project

2014-12-09 15:36:07 +01:00