Skip to content
Commit 8918486e authored by olliw42's avatar olliw42
Browse files

Merge branch 'pr-qmlclean' into pr-canshootphotoidle 

# Conflicts:
#	src/FlightMap/Widgets/CameraPageWidget.qml
parents 5d33a26e bd997d44
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment