gered/clj-jtwig
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into java6

Browse source 
Conflicts:
	README.md
	project.clj
This commit is contained in:
Gered 2014-03-27 18:13:03 -04:00
parent 59eabaaaff 85eae35813
commit b46815ea65
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -6,7 +6,7 @@ Clojure wrapper around Jtwig to make using it in Clojure applications simple.
**This is the Java 6 branch.** It is identical in every way to the master branch, except for the use of a version of
Jtwig that has been very slightly modified to be Java 6 compatible.
[Please see the master branch for more information about clj-jtwig.](https://github.com/gered/clj-jtwig/tree/java6)
[Please see the master branch for more information about clj-jtwig.](https://github.com/gered/clj-jtwig)
## License

4
project.clj
View file

@ -1,8 +1,8 @@
(defproject clj-jtwig-java6 "0.3.1"
(defproject clj-jtwig-java6 "0.3.2"
:description "Clojure wrapper for JTwig (Java 6 dependencies)"
:url "https://github.com/gered/clj-jtwig/tree/java6"
:license {:name "Apache License, Version 2.0"
:url "http://www.apache.org/licenses/LICENSE-2.0"}
:dependencies [[org.clojure/clojure "1.5.1"]
[com.lyncode/jtwig-core-java6 "2.1.2"]
[com.lyncode/jtwig-core-java6 "2.1.4"]
[org.apache.commons/commons-lang3 "3.1"]])