4 commits

Author	SHA1	Message	Date
Stephen Nelson	6e0ebc20f7	Upgrade clojure dependency to 1.7.0	2015-07-16 15:11:01 +12:00
Jean Niklas L'orange	a296ff8918	Bump all Clojure 1.5.1 deps to 1.6.0.	2014-03-26 13:43:38 +01:00
Marshall Bockrath-Vandegrift	5d64d83fd6	More nuanced merging of project defaults.	2013-10-14 19:59:18 -04:00
Marshall Bockrath-Vandegrift	39e3d57ec9	Implement :uberjar-merge-with requested in issue #973.	2013-10-05 13:56:57 -04:00