Merge with latest master from upstream. Fix merge conflict with Leiningen.gitignore

This commit is contained in:
Sean Brewer committed 2013-11-07 21:50:41 -05:00
commit e4cc7a56ba
62 files changed
+293 -111

No files matched your search

+1
View File
@@ -5,3 +5,4 @@ pom.xml
/targets/
.lein-deps-sum
.lein-repl-history
.lein-plugins/