Merge branch 'release/1.0.4' into develop

filestack · May 16, 2017 · 695a404 · 695a404
2 parents 873d239 + 1527c57
commit 695a404
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Filestack-php Changelog
 
+## 1.0.4 (May 16, 2017)
+- FS-398 added zip() and compress() functionalities
+- FS-406 added screenshot() functionality
+- FS-408 added collage() funcionality
+- FS-94 added debug() call
+- FS-409 added convertFile() functionality
+- FS-410 added Audio and Video conversions
+
 ## 1.0.3 (May 8, 2017)
 - FS-89 Integrated tests with TravisCI
 - FS-90 Implemented Security

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.3
+1.0.4