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

Merge branch 'hotfix/1.1.2' into develop

Browse Source
This commit is contained in:
Cesidio Di Landa 2013-07-26 11:39:08 +02:00
commit 89206c1631
3 changed files with 9 additions and 5 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.2
-----
* Updated gems
1.1.1 1.1.1
----- -----
* Updated gems * Updated gems

8
Gemfile.lock
View File

@ -139,13 +139,13 @@ GEM
multi_json (1.7.7) multi_json (1.7.7)
nokogiri (1.6.0) nokogiri (1.6.0)
mini_portile (~> 0.5.0) mini_portile (~> 0.5.0)
pg (0.15.1) pg (0.16.0)
polyglot (0.3.3) polyglot (0.3.3)
pry (0.9.12.2) pry (0.9.12.2)
coderay (~> 1.0.5) coderay (~> 1.0.5)
method_source (~> 0.8) method_source (~> 0.8)
slop (~> 3.4) slop (~> 3.4)
pry-rails (0.3.1) pry-rails (0.3.2)
pry (>= 0.9.10) pry (>= 0.9.10)
puma (2.4.0) puma (2.4.0)
rack (>= 1.1, < 2.0) rack (>= 1.1, < 2.0)
@ -208,7 +208,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.7.1) simplecov-html (~> 0.7.1)
simplecov-html (0.7.1) simplecov-html (0.7.1)
slop (3.4.5) slop (3.4.6)
sprockets (2.10.0) sprockets (2.10.0)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -222,7 +222,7 @@ GEM
libv8 (~> 3.11.8.12) libv8 (~> 3.11.8.12)
ref ref
thor (0.18.1) thor (0.18.1)
thread_safe (0.1.0) thread_safe (0.1.2)
atomic atomic
tilt (1.4.1) tilt (1.4.1)
treetop (1.4.14) treetop (1.4.14)

2
VERSION
View File

@ -1 +1 @@
1.1.1 1.1.2