Commit ce739ef5 authored by Benjamin Neff's avatar Benjamin Neff

Merge branch 'next-minor' into develop

parents 351b4d28 e82005c5
......@@ -6,6 +6,10 @@ AllCops:
Enabled: true
# Disable for rails 4
Enabled: false
# Commonly used screens these days easily fit more than 80 characters.
Max: 120
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