Merge branch 'release/1.0'

# Conflicts: # pom.xml
cantaloupe-project · Oct 18, 2015 · 8f4b9bd · 8f4b9bd
2 parents 0a43b9c + a2d00d1
commit 8f4b9bd
Show file tree

Hide file tree

Showing 71 changed files with 2,385 additions and 899 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 nbactions.xml
 
 /target
+/website/javadoc
 cantaloupe.properties
 dependency-reduced-pom.xml
 stdout.ppm
diff --git a/CHANGES.md b/CHANGES.md