From: Lucian Mogosanu <lucian.mogosanu@gmail.com>
Date: Mon, 26 Aug 2013 11:23:14 +0000 (+0300)
Subject: Merge branch 'testing'
X-Git-Tag: v0.2~6
X-Git-Url: https://git.mogosanu.ro/?a=commitdiff_plain;h=3311b33df3abfc36d1ab63f1471c3ce8adf7ab7b;p=thetarpit.git

Merge branch 'testing'

Conflicts:
	css/syntax.css
---

3311b33df3abfc36d1ab63f1471c3ce8adf7ab7b
diff --cc css/syntax.css
index 8b2d35d,f3d94c1..5f40e0c
--- a/css/syntax.css
+++ b/css/syntax.css
@@@ -19,6 -19,6 +19,6 @@@ pre.sourceCode span.fu { color: #06287e
  pre.sourceCode span.re { }
  pre.sourceCode span.er { color: red; font-weight: bold; }
  
 -pre.sourceCode {
 +pre {
- 	background-color: #f7f7f9;
+ 	background-color: #f2f4f9;
  }