Merge remote-tracking branch 'upstream/master'

Author: asakura

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v2.5.0
+* Enhancements:
+  * [Greatly improved formatting of generated JavaScript](https://github.com/bryanjos/elixir-estree/pull/15)
+
+# v2.4.2
+* Fixes
+  * [Expressions in variable declarations](https://github.com/bryanjos/elixir-estree/pull/13)
+
 # v2.4.1
 * Fixes
   * Handle edge case when string literal is a JSX child