Merge branch 'master' of https://github.com/syholloway/mrcolor

syhol · Oct 10, 2013 · b939325 · b939325
2 parents c755c81 + 2a4938e
commit b939325
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 457 deletions.
diff --git a/.gitignore b/.gitignore
@@ -166,4 +166,5 @@ pip-log.txt
 .sass-cache/
 
 #sublimetext
-*.sublime-project
+*.sublime-project
+*.sublime-workspace