morant 2e5a0e1439 Merge remote-tracking branch 'upstream/develop' into feature/microworlds ... * Removed microwords from server/routes for now. # Conflicts: # server/routes.json # src/components/thumbnail/thumbnail.jsx		2016-03-11 21:14:27 -05:00
..
about	Migrate static images for about view	2015-11-18 20:09:29 -05:00
hoc2015	Add Made with Code Logo	2015-11-20 09:56:10 -05:00
microworlds	adding tips to the microworld	2015-12-21 13:30:22 -05:00
wedo	[WIP] Add WeDo Landing page	2016-03-09 14:33:17 -05:00
dropdown.png	Update User Info and Assets in Navigation	2015-09-23 09:57:20 -04:00
forum-image.png	Add interactive design studio, and make studios show arts projects.	2015-11-29 09:32:01 -05:00
jobs.png	created jobs page	2015-11-29 13:42:26 -05:00
logo_sm.png	Navigation WIP	2015-09-21 09:18:00 -04:00
logo_sm_highlight.png	Navigation WIP	2015-09-21 09:18:00 -04:00
mystuff.png	Update User Info and Assets in Navigation	2015-09-23 09:57:20 -04:00
nav-notifications.png	Update User Info and Assets in Navigation	2015-09-23 09:57:20 -04:00
nav-search-glass.png	Navigation WIP	2015-09-21 09:18:00 -04:00
scratch-og.png	Update default og:image	2015-10-29 18:40:56 -04:00
welcome-connect.png	Add welcome component and show it conditionally	2015-10-22 12:21:47 -04:00
welcome-learn.png	Add welcome component and show it conditionally	2015-10-22 12:21:47 -04:00
welcome-try.png	Add welcome component and show it conditionally	2015-10-22 12:21:47 -04:00