Permalink
Browse files

Merge branch 'master' into stable

  • Loading branch information...
crayfishx committed Feb 16, 2017
2 parents f47e855 + b1e08fa commit f9009419adc07cc61449cd62f8bce541f2af5125
Showing with 7 additions and 1 deletion.
  1. +5 −0 CHANGELOG.md
  2. +1 −0 lib/jerakia/server/rest.rb
  3. +1 −1 lib/jerakia/version.rb
@@ -1,5 +1,10 @@
# Jerakia Release Notes
### 1.2.1
* Fixed omision from 1.2 that failed to authenticate tokens using the API
## 1.2.0
* New feature, Jerakia Server
@@ -45,6 +45,7 @@ def authenticate!
end
before do
authenticate!
content_type 'application/json'
end
@@ -3,5 +3,5 @@ class Jerakia
#
# This should be updated when a new gem is released and it is read from the gemspec file
#
VERSION = '1.2.0'.freeze
VERSION = '1.2.1'.freeze
end

0 comments on commit f900941

Please sign in to comment.