Matthew Taylor 87146c3193 Merge branch 'hotfix/dec-1' of https://github.com/LLK/scratch-www into develop ... * 'hotfix/dec-1' of https://github.com/LLK/scratch-www: update transifex config to reflect new conference page fix lint update translations to just use `FormattedMessage` Change back routeAlias for conference pages Add Learning Resource designer (#1676) Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673) Fix #1649: Edit Scratch Conf Website - Correct Info for Costa Rica Conf (#1650) (#1663) # Conflicts: # src/routes.json # src/views/conference/2018/index/index.jsx # src/views/conference/2018/index/l10n.json		2017-11-21 17:14:19 -05:00
..
components	Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673)	2017-11-21 09:19:37 -05:00
lib	provide a default opts if it’s undefined	2017-09-18 14:40:52 -04:00
redux	Merge branch 'issue/gh-1546' into develop	2017-10-26 08:41:54 -04:00
views	Merge branch 'hotfix/dec-1' of https://github.com/LLK/scratch-www into develop	2017-11-21 17:14:19 -05:00
_colors.scss	Down Deep - Scratch Camp 2017 Page (#1409)	2017-07-19 11:48:29 -04:00
_frameless.scss	Style pass	2016-06-15 15:08:56 -04:00
init.js	Set up Raven within init.js	2016-05-17 21:02:35 -04:00
l10n.json	Revise student invitation string	2017-09-01 09:20:36 -04:00
main.scss	Clean up a few lint warnings	2016-08-12 08:10:42 -04:00
routes-dev.json	Hide components route in production	2016-05-24 17:15:03 -04:00
routes.json	Change back routeAlias for conference pages	2017-11-21 09:25:42 -05:00
template-config.js	Make template variables a bit less verbose	2016-09-09 09:21:03 -04:00
template.ejs	Make template variables a bit less verbose	2016-09-09 09:21:03 -04:00