Skip to content
GitLab
Commit 35f4b0f0 authored by Will Roscoe's avatar Will Roscoe
Browse files

Merge branch 'wr/camera_resolution' 

Conflicts:
	settings.py
parents a6d72582 148adadf
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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