Adam Bradley 8e97c8b30c Merge remote-tracking branch 'origin/master' ...

Conflicts:
	src/components/app/_scaffolding.scss

2015-04-09 09:51:46 -05:00

..

nav-view.js

feat(splitView): add initial splitView (this is not final)

2015-04-09 08:37:49 -04:00

nav-view.scss

tabs over tabs

2015-04-09 09:50:44 -05:00