Browse Source

Merge branch 'hotfix/1.0.6'

development
Geremia Taglialatela 12 years ago
parent
commit
0797d4ad61
  1. 4
      CHANGELOG.md
  2. 4
      Gemfile.lock
  3. 2
      VERSION

4
CHANGELOG.md

@ -1,6 +1,10 @@
Changelog Changelog
========= =========
1.0.6
-----
* Updated gems
1.0.5 1.0.5
----- -----
* Updated gems * Updated gems

4
Gemfile.lock

@ -181,7 +181,7 @@ GEM
rspec-core (~> 2.14.0) rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0) rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0) rspec-mocks (~> 2.14.0)
rspec-core (2.14.2) rspec-core (2.14.3)
rspec-expectations (2.14.0) rspec-expectations (2.14.0)
diff-lcs (>= 1.1.3, < 2.0) diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.1) rspec-mocks (2.14.1)
@ -231,7 +231,7 @@ GEM
turbolinks (1.3.0) turbolinks (1.3.0)
coffee-rails coffee-rails
tzinfo (0.3.37) tzinfo (0.3.37)
uglifier (2.1.1) uglifier (2.1.2)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2) multi_json (~> 1.0, >= 1.0.2)
unicorn (4.6.3) unicorn (4.6.3)

2
VERSION

@ -1 +1 @@
1.0.5 1.0.6

Loading…
Cancel
Save