Commit 75130bbe authored by Douwe Maan's avatar Douwe Maan

Merge branch 'revert-3c2cff0c' into 'master'

Revert "Merge branch 'zj-fix-charlock_holmes' into 'master'"

See merge request !13533
parents 725b3837 5c13c734
...@@ -113,7 +113,7 @@ GEM ...@@ -113,7 +113,7 @@ GEM
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
mime-types (>= 1.16) mime-types (>= 1.16)
cause (0.1) cause (0.1)
charlock_holmes (0.7.4) charlock_holmes (0.7.3)
chronic (0.10.2) chronic (0.10.2)
chronic_duration (0.10.6) chronic_duration (0.10.6)
numerizer (~> 0.1.1) numerizer (~> 0.1.1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment