Merge remote-tracking branch 'origin/master' into cli2

This commit is contained in:
Peter Eckersley
2015-09-15 17:35:36 -07:00
81 changed files with 762 additions and 248 deletions
+1 -1
View File
@@ -218,7 +218,7 @@ ignore-long-lines=^\s*(# )?<?https?://\S+>?$
single-line-if-stmt=no
# List of optional constructs for which whitespace checking is disabled
no-space-check=trailing-comma,dict-separator
no-space-check=trailing-comma
# Maximum number of lines in a module
max-module-lines=1250