Riley Davis a0c03605b9 Merge branch 'master' ...

Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-framework/constants/auth.js
	client/coral-framework/reducers/auth.js
	client/coral-sign-in/components/SignUpContent.js

2017-02-03 13:12:32 -07:00

..

admin

add a confirm-email landing page

2017-01-27 15:04:42 -07:00

api

Merge branch 'master'

2017-02-03 13:12:32 -07:00

assets

Add basic index page for assets

2017-01-25 15:23:02 -05:00

embed

added comments to linter

2016-12-16 16:46:15 -07:00

index.js

Rename /Coral.js to /embed.js

2017-02-04 01:48:57 +08:00