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

Merge branch 'hotfix/1.1.1' into develop

Browse Source
This commit is contained in:
Cesidio Di Landa 2013-07-23 10:05:53 +02:00
commit 540108f1f9
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,6 +1,10 @@
Changelog Changelog
========= =========
1.1.1
-----
* Updated gems
1.1.0 1.1.0
----- -----
* Support for Nitrous.IO * Support for Nitrous.IO

6
Gemfile.lock
View File

@ -87,7 +87,7 @@ GEM
delorean (2.1.0) delorean (2.1.0)
chronic chronic
diff-lcs (1.2.4) diff-lcs (1.2.4)
email_spec (1.4.0) email_spec (1.5.0)
launchy (~> 2.1) launchy (~> 2.1)
mail (~> 2.2) mail (~> 2.2)
erubis (2.7.0) erubis (2.7.0)
@ -147,7 +147,7 @@ GEM
slop (~> 3.4) slop (~> 3.4)
pry-rails (0.3.1) pry-rails (0.3.1)
pry (>= 0.9.10) pry (>= 0.9.10)
puma (2.3.2) puma (2.4.0)
rack (>= 1.1, < 2.0) rack (>= 1.1, < 2.0)
rack (1.5.2) rack (1.5.2)
rack-contrib (1.1.0) rack-contrib (1.1.0)
@ -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.3) rspec-core (2.14.4)
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)

2
VERSION
View File

@ -1 +1 @@
1.1.0 1.1.1