Rebased from upstream

This commit is contained in:
raluka 2016-01-22 16:24:53 +01:00
parent 48db99389e
commit 04a437bdb0

View file

@ -315,8 +315,6 @@ GEM
prawn_rails (0.0.11) prawn_rails (0.0.11)
prawn (>= 0.11.1) prawn (>= 0.11.1)
railties (>= 3.0.0) railties (>= 3.0.0)
protected_attributes (1.1.3)
activemodel (>= 4.0.1, < 5.0)
pry (0.10.3) pry (0.10.3)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
@ -450,7 +448,6 @@ GEM
tins (~> 1.0) tins (~> 1.0)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.5) thread_safe (0.3.5)
timers (1.1.0)
tilt (2.0.1) tilt (2.0.1)
timecop (0.8.0) timecop (0.8.0)
tins (1.6.0) tins (1.6.0)