Commit Graph

2 Commits

Author SHA1 Message Date
Corey Johnson
06b63c24dc Merge remote-tracking branch 'origin/dev' into md-preview-redux
Conflicts:
	src/packages/markdown-preview/stylesheets/markdown-preview.css
	static/atom.css
	static/command-panel.css
2013-03-11 17:02:36 -07:00
Justin Palmer
392b9cfeab command-panel.css -> command-panel.less 2013-03-11 10:02:19 -07:00