Merge branch 'master' of https://github.com/k3b/AndroFotoFinder · k3b/APhotoManager@29a74f3 · GitHub

Commit

Merge branch 'master' of https://github.com/k3b/AndroFotoFinder

Browse files

Conflicts:
	ToDo.txt
	wiki/Image-View.md

Loading branch information

k3b committed Sep 12, 2015

2 parents 6278545 + 1d3f97b commit 29a74f3