Pete Richards 65043d0ff3 squash merge open933 into integration-1089, resolve merge conflicts.

2016-10-12 13:47:56 -07:00

..

res/sass

squash merge open933 into integration-1089, resolve merge conflicts.

2016-10-12 13:47:56 -07:00

bundle.js

[Documentation] Updated copyright statement. Fixes #1081

2016-07-12 16:55:57 -07:00