Merge branch 'master' into htmlfix
[phpfspot.git] / resources / camera.png
resources/camera.png