Matthew Taylor 0894724dfd Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn ... * 'develop' of https://github.com/rthorn/scratch-www: Removed rows from grid, changed explore tabs Removed extraneous image file Whitespace added Small fix Support for studios Refactoring, new grid component Style changes Changed path of search page to allow for studio tabs Changes to path for search results Removed unnecessary files Search page functions Starting mock of search page Fixed problem with loading Load button and tabs functioning Merge remote-tracking branch 'LLK/develop' into develop Early Explore Page # Conflicts: # src/components/navigation/www/navigation.jsx		2016-06-07 09:06:01 -04:00
..
thumbnail.jsx	Refactoring, new grid component	2016-05-10 00:54:46 -04:00
thumbnail.scss	Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn	2016-06-07 09:06:01 -04:00