Commit 8f262e7b0090d724be56445895ef8e1583665672

Authored by Daniel Alves
Committed by Rafael Manzo
1 parent 40903bd9

Solving conflicts on Gemfile.

Signed off by: Heitor Reis <marcheing@gmail.com>
Showing 1 changed file with 9 additions and 9 deletions   Show diff stats
Gemfile.lock
... ... @@ -42,7 +42,7 @@ GEM
42 42 activemodel (~> 4.0)
43 43 activesupport (~> 4.0)
44 44 rails-observers (~> 0.1.1)
45   - activesupport (4.1.6)
  45 + activesupport (4.1.8)
46 46 i18n (~> 0.6, >= 0.6.9)
47 47 json (~> 1.7, >= 1.7.7)
48 48 minitest (~> 5.1)
... ... @@ -145,7 +145,7 @@ GEM
145 145 jquery-ui-rails (5.0.3)
146 146 railties (>= 3.2.16)
147 147 json (1.8.1)
148   - konacha (3.2.5)
  148 + konacha (3.3.0)
149 149 actionpack (>= 3.1, < 5)
150 150 capybara
151 151 colorize
... ... @@ -190,13 +190,13 @@ GEM
190 190 sprockets-rails (~> 2.0)
191 191 rails-observers (0.1.2)
192 192 activemodel (~> 4.0)
193   - railties (4.1.6)
194   - actionpack (= 4.1.6)
195   - activesupport (= 4.1.6)
  193 + railties (4.1.8)
  194 + actionpack (= 4.1.8)
  195 + activesupport (= 4.1.8)
196 196 rake (>= 0.8.7)
197 197 thor (>= 0.18.1, < 2.0)
198 198 rake (10.4.2)
199   - rdoc (4.1.2)
  199 + rdoc (4.2.0)
200 200 json (~> 1.4)
201 201 ref (1.0.5)
202 202 responders (1.1.2)
... ... @@ -260,11 +260,11 @@ GEM
260 260 thread_safe (0.3.4)
261 261 tilt (1.4.1)
262 262 tins (1.3.3)
263   - turbolinks (2.5.2)
  263 + turbolinks (2.5.3)
264 264 coffee-rails
265 265 tzinfo (1.2.2)
266 266 thread_safe (~> 0.1)
267   - uglifier (2.5.3)
  267 + uglifier (2.6.0)
268 268 execjs (>= 0.3.0)
269 269 json (>= 1.8.0)
270 270 warden (1.2.3)
... ... @@ -298,7 +298,7 @@ DEPENDENCIES
298 298 jquery-rails
299 299 jquery-ui-rails (~> 5.0.0)
300 300 kalibro_client!
301   - konacha (~> 3.2.0)
  301 + konacha (~> 3.3.0)
302 302 mocha
303 303 pg (~> 0.17.0)
304 304 poltergeist (~> 1.5.0)
... ...