bike/BikeBikeBike
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix/1.0.6' into develop

Browse Source
This commit is contained in:
Geremia Taglialatela
2013-07-14 12:04:28 +02:00
parent 59fc45d93f b0f90baf2e
commit 9def4048d2
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+4
View File
@@ -1,6 +1,10 @@
Changelog Changelog
========= =========
1.0.6
-----
* Updated gems
1.0.5 1.0.5
----- -----
* Updated gems * Updated gems
Gemfile.lock
+2 -2
View File
@@ -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)
VERSION
+1 -1
View File
@@ -1 +1 @@
1.0.5 1.0.6