Merge branch '116209751-verified_option' into staging

This commit is contained in:
Stas 2016-04-19 11:20:27 +03:00
commit 1360699f01

View file

@ -209,9 +209,6 @@ GEM
docile (1.1.5) docile (1.1.5)
domain_name (0.5.25) domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
epp-xml (1.0.4)
activesupport (~> 4.1)
builder (~> 3.2)
equalizer (0.0.11) equalizer (0.0.11)
erubis (2.7.0) erubis (2.7.0)
execjs (2.6.0) execjs (2.6.0)
@ -608,7 +605,7 @@ DEPENDENCIES
devise (= 3.5.4) devise (= 3.5.4)
digidoc_client (= 0.2.1) digidoc_client (= 0.2.1)
epp (= 1.4.2)! epp (= 1.4.2)!
epp-xml (= 1.0.4) epp-xml (= 1.0.4)!
fabrication (= 2.13.2) fabrication (= 2.13.2)
faker (= 1.4.3) faker (= 1.4.3)
figaro (= 1.1.1) figaro (= 1.1.1)