Merge branch '269-photo-cropping-broken-2' of...

Merge branch '269-photo-cropping-broken-2' of edugit.org:AlekSIS/Official/AlekSIS into 269-photo-cropping-broken-2
3 jobs for 269-photo-cropping-broken-2 in 3 minutes and 41 seconds (queued for 3 seconds)
latest