diff options
| author | Andres Rey <[email protected]> | 2017-11-12 10:57:34 +0000 |
|---|---|---|
| committer | Andres Rey <[email protected]> | 2017-11-12 10:57:34 +0000 |
| commit | d51c2bcf367bd4b80a91d2eaaff30f485033ba90 (patch) | |
| tree | b93ca06898b23e07bdf7e3e81c3247ded8738f20 /.styleci.yml | |
| parent | 0cba538a7750589a105ce3565cf9f7735501cae2 (diff) | |
| parent | 887af389798882f228a8e150620279924f55fe38 (diff) | |
Merge remote-tracking branch 'origin/development-update-to-f0edc77cb58ef52890e3065cf2b0e334d940feb2' into development-update-to-f0edc77cb58ef52890e3065cf2b0e334d940feb2
# Conflicts:
# test/test-pages/daringfireball-1/expected.html
# test/test-pages/iab-1/expected.html
# test/test-pages/liberation-1/expected.html
# test/test-pages/yahoo-4/expected.html
Diffstat (limited to '.styleci.yml')
0 files changed, 0 insertions, 0 deletions