Merge pull request #36 from webhippie/feature/version

Bumped to 1.2.0

Author: tboerger

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.2.0](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.2.0) - 2016-06-02
+
+* Support for JSX files (@artemv)
+* Fixed test suite, reduced test matrix (@tboerger)
+
 ## [1.1.0](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.1.0) - 2016-06-02
 
 * Replace hyphens with underscores in locale var from DOM (@filib)

README.md

@@ -33,7 +33,7 @@ with older versions, but because of version bumps at `gettext_i18n_rails` and
 ## Installation
 
 ```ruby
-gem "gettext_i18n_rails_js", "~> 1.1.0"
+gem "gettext_i18n_rails_js", "~> 1.2.0"
 ```
 
 

lib/gettext_i18n_rails_js/version.rb

@@ -26,7 +26,7 @@
 module GettextI18nRailsJs
   class Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     PRE = nil