Merge branch 'master' into generators

bryanjos · bryanjos · commit 23a302d16ca1 · 2017-09-25T20:10:54.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [unreleased]
+## [0.31.0] - 2017-09-24
 ### Added
 - [Compiler will now accept a path to Elixir Files to compile](https://github.com/elixirscript/elixirscript/issues/420)
 - [Added `ElixirScript.JS.map_to_object/2` with options [keys: :string, symbols: false]](https://github.com/elixirscript/elixirscript/issues/362)
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do
   def project do
     [
       app: :elixir_script,
-      version: "0.31.0-dev",
+      version: "0.31.0",
       elixir: "~> 1.5",
       elixirc_paths: elixirc_paths(Mix.env),
       deps: deps(),

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ defmodule ElixirScript.Mixfile do`
`4`	`4`	`def project do`
`5`	`5`	`[`
`6`	`6`	`app: :elixir_script,`
`7`		`- version: "0.31.0-dev",`
	`7`	`+ version: "0.31.0",`
`8`	`8`	`elixir: "~> 1.5",`
`9`	`9`	`elixirc_paths: elixirc_paths(Mix.env),`
`10`	`10`	`deps: deps(),`