scratch-www/src/components/intro
Matthew Taylor 997b94a91c Merge branch 'develop' into feature/react-intl
* develop:
  Fix 'M' issue in Firefox
  Widen modal to account for tooltip overflow
  Name Registration component
  Refresh session, close popup after registration
  Add standalone legacy registration iframe

# Conflicts:
#	server/proxies.json
#	src/components/navigation/navigation.jsx
2015-10-16 11:14:45 -04:00
..
intro.jsx Add formatted messages 2015-10-16 11:04:01 -04:00
intro.scss Add standalone legacy registration iframe 2015-10-15 11:13:02 -06:00