Merge branch 'release/1.0.4'

.editorconfig

@@ -0,0 +1,17 @@
+# For more information about the properties used in this file,
+# please see the EditorConfig documentation:
+# http://editorconfig.org
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{*.yml,package.json}]
+indent_size = 2
+
+# The indent size used in the package.json file cannot be changed:
+# https://github.com/npm/npm/pull/3180#issuecomment-16336516

CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
-All Notable changes to `studiobonito/silverstripe-shortcodes` will be documented in this file
+All Notable changes to `studiobonito/silverstripe-shortcodes` will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.4] - 2015-12-17
+### Added
+- Included `.editorconfig` file.
+
 ## [1.0.3] - 2015-10-02
 ### Added
 - Included changelog.
@@ -27,6 +31,7 @@ All Notable changes to `studiobonito/silverstripe-shortcodes` will be documented
 - Updated readme.
 
 [Unreleased]: https://github.com/studiobonito/silverstripe-shortcodes/compare/1.0.3...HEAD
+[1.0.4]: https://github.com/studiobonito/silverstripe-shortcodes/compare/1.0.3...1.0.4
 [1.0.3]: https://github.com/studiobonito/silverstripe-shortcodes/compare/1.0.2...1.0.3
 [1.0.2]: https://github.com/studiobonito/silverstripe-shortcodes/compare/1.0.1...1.0.2
 [1.0.1]: https://github.com/studiobonito/silverstripe-shortcodes/compare/1.0.0...1.0.1