Merge branch 'master' into derp
Conflicts: docs/_includes/components/alerts.html docs/_includes/getting-started/browser-device-support.html
Showing
+3 -3
Please register or sign in to comment
Conflicts: docs/_includes/components/alerts.html docs/_includes/getting-started/browser-device-support.html