Merge pull request #12 from inaka/elbrujohalcon.12.bump_version_to_1_0_1

Bump Version to 1.0.1
inaka · Jul 10, 2018 · 48691de · 48691de
2 parents d658003 + 400f2ad
commit 48691de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.awconfig b/.awconfig
@@ -0,0 +1 @@
+---
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,18 @@
 # Change Log
 
+## [1.0.1](https://github.com/inaka/mixer/tree/1.0.1) (2018-07-10)
+[Full Changelog](https://github.com/inaka/mixer/compare/1.0.0...1.0.1)
+
+**Merged pull requests:**
+
+- Use reserved words as function name [\#10](https://github.com/inaka/mixer/pull/10) ([f3c0](https://github.com/f3c0))
+
 ## [1.0.0](https://github.com/inaka/mixer/tree/1.0.0) (2017-10-11)
 [Full Changelog](https://github.com/inaka/mixer/compare/0.1.5...1.0.0)
 
 **Merged pull requests:**
 
+- Version bump to 1.0.0 [\#9](https://github.com/inaka/mixer/pull/9) ([harenson](https://github.com/harenson))
 - Add new mixin type [\#8](https://github.com/inaka/mixer/pull/8) ([kevsmith](https://github.com/kevsmith))
 
 ## [0.1.5](https://github.com/inaka/mixer/tree/0.1.5) (2015-12-29)

diff --git a/src/mixer.app.src b/src/mixer.app.src
@@ -21,10 +21,9 @@
 {application, mixer,
  [
   {description, "Mix in public functions from external modules"},
-  {vsn, "1.0.0"},
+  {vsn, "1.0.1"},
   {registered, []},
-  {applications, [kernel,
-                  stdlib]},
+  {applications, [kernel, stdlib]},
   {env, []},
   {pkg_name, inaka_mixer},
   {maintainers, ["Inaka"]},