Matthew Taylor 54920f5e9f Merge branch 'develop' into feature/upgrade-react-0.14 ... * develop: Avoid class name conflict on login li Update Hover JS fuctions with intative naming Remove extra white space on HOC Landing Add Collaborators and Logos Add CN Logo to Hide & Seek asset Remove excess/unused CSS Update HOC with Banner Hoverstates & Assets		2015-10-14 23:03:01 -04:00
..
components	Merge branch 'develop' into feature/upgrade-react-0.14	2015-10-14 23:03:01 -04:00
lib	Update core react dependencies	2015-10-14 22:59:38 -04:00
mixins	Resolve merge conflict	2015-10-13 15:57:55 -04:00
views	Update Hover JS fuctions with intative naming	2015-10-14 14:53:40 -06:00
_colors.scss	Update Global Colors SCSS to include Underscore	2015-09-29 13:51:46 -04:00
environment.js	Make app more transparent to Selenium	2015-10-09 14:16:37 -06:00
main.jsx	Consolidate rendering to helper function	2015-10-13 11:45:23 -06:00
main.scss	Remove Red Outline on "href='''	2015-10-06 15:49:10 -04:00
session.js	Allow configuring the API host	2015-10-07 16:15:10 -04:00