Skip to content
Snippets Groups Projects
Commit 94b38313 authored by Kevin Lee's avatar Kevin Lee
Browse files

Merge branch 'master' into fix/ios_cardboard_support

# Conflicts:
#	src/utils/vr-caps-detect.js
parents 3d43b0a9 80d499d0
No related branches found
No related tags found
Loading
Showing
with 1120 additions and 33 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment