Merge branch '2.5'

FasterXML · Mar 9, 2015 · 8ed26e9 · 8ed26e9
2 parents 63d9b0b + e65b017
commit 8ed26e9
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,8 @@
+This copy of Jackson JSON processor databind module is licensed under the
+Apache (Software) License, version 2.0 ("the License").
+See the License for details about distribution rights, and the
+specific rights regarding derivate works.
+
+You may obtain a copy of the License at:
+
+http://www.apache.org/licenses/LICENSE-2.0