Merge branch 'master' into PLT-25

2015-10-26 22:11:42 -07:00
--- a/web/static/css/highlight
+++ b/web/static/css/highlight
@@ -0,0 +1 @@
+../../react/node_modules/highlight.js/styles/
--- a/web/static/images/themes/code_themes/github.png
+++ b/web/static/images/themes/code_themes/github.png
--- a/web/static/images/themes/code_themes/monokai.png
+++ b/web/static/images/themes/code_themes/monokai.png
--- a/web/static/images/themes/code_themes/solarized_dark.png
+++ b/web/static/images/themes/code_themes/solarized_dark.png
--- a/web/static/images/themes/code_themes/solarized_light.png
+++ b/web/static/images/themes/code_themes/solarized_light.png
				`@@ -0,0 +1 @@`
				`../../react/node_modules/highlight.js/styles/`