Commit graph

25 commits

Author SHA1 Message Date
Gered 9b67fd677e fix incorrect dependency 2014-06-15 01:27:40 -04:00
Gered e87689c77e Merge branch 'master' into java6
Conflicts:
	README.md
	project.clj
2014-06-15 01:21:09 -04:00
Gered bd8112377f bump version 2014-06-15 01:18:47 -04:00
Gered 6406a31c98 clojure 1.6.0 2014-06-12 16:23:53 -04:00
Gered 5ab808a9fe Merge branch 'master' into java6
Conflicts:
	README.md
	project.clj
2014-06-11 09:19:21 -04:00
Gered 8c4aeddf69 update jtwig version 2014-06-11 09:16:01 -04:00
Gered 234304ddc4 Merge branch 'master' into java6
Conflicts:
	project.clj
2014-06-01 17:23:28 -04:00
Gered 3ab9add950 bump version 2014-06-01 17:18:49 -04:00
Gered b46815ea65 Merge branch 'master' into java6
Conflicts:
	README.md
	project.clj
2014-03-27 18:13:03 -04:00
Gered 85eae35813 bump version 2014-03-27 18:10:43 -04:00
Gered 2d887342b8 update jtwig version 2014-03-27 18:10:26 -04:00
Gered 59eabaaaff Merge branch 'master' into java6
Conflicts:
	README.md
	project.clj
2014-03-23 13:19:38 -04:00
Gered 5213d1baea bump version 2014-03-23 13:17:46 -04:00
Gered b66cdbf79e Merge branch 'master' into java6
Conflicts:
	project.clj
2014-03-23 11:47:42 -04:00
Gered aae62834d8 bump version 2014-03-23 11:45:47 -04:00
Gered b8c938b2ea add capitalize_all 2014-03-23 10:28:40 -04:00
Gered 11fd9dd291 use java6 dependency 2014-03-22 16:44:25 -04:00
Gered a3a4d7747b Merge branch 'master' into java6
Conflicts:
	project.clj
2014-03-22 16:43:58 -04:00
Gered 84ee498aa2 update to jtwig 2.1.2 2014-03-22 16:42:40 -04:00
Gered b120bc3270 not exactly sure how i messed up that merge... 2014-03-05 19:18:38 -05:00
Gered b1dde0bc69 bump version 2014-03-05 19:16:26 -05:00
Gered 17caf40f2a bump version 2014-03-04 16:55:36 -05:00
Gered 1595d54041 update version 2014-03-04 14:28:39 -05:00
Gered 7532d61008 update to jtwig 2.1.1 2014-03-03 09:38:52 -05:00
Gered 45c4417e41 initial commit, complete with "hello world" ... woohoo! 2014-03-01 09:08:20 -05:00