diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-20 14:35:20 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-20 14:35:20 -0700 |
| commit | 8b2a5cad2dd3a8fa28091eafab9e1aebbaae3865 (patch) | |
| tree | 1ac0a27ce65cddb183668e6b395839d6f289a09f /web/src/js/components/ContentView/ContentViews.jsx | |
| parent | b27db1fc812b5b9935599caf5d0a2cdfe34d7322 (diff) | |
| parent | 281f20ef1e9ac33a7e210ba562eb2914f6d187e6 (diff) | |
| download | mitmproxy-8b2a5cad2dd3a8fa28091eafab9e1aebbaae3865.tar.gz mitmproxy-8b2a5cad2dd3a8fa28091eafab9e1aebbaae3865.tar.bz2 mitmproxy-8b2a5cad2dd3a8fa28091eafab9e1aebbaae3865.zip | |
Merge remote-tracking branch 'origin/flow_editing'
Diffstat (limited to 'web/src/js/components/ContentView/ContentViews.jsx')
| -rw-r--r-- | web/src/js/components/ContentView/ContentViews.jsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/web/src/js/components/ContentView/ContentViews.jsx b/web/src/js/components/ContentView/ContentViews.jsx index b0297dcc..82ee0adc 100644 --- a/web/src/js/components/ContentView/ContentViews.jsx +++ b/web/src/js/components/ContentView/ContentViews.jsx @@ -2,6 +2,7 @@ import React, { PropTypes } from 'react' import ContentLoader from './ContentLoader' import { MessageUtils } from '../../flow/utils.js' + const views = [ViewAuto, ViewImage, ViewJSON, ViewRaw] ViewImage.regex = /^image\/(png|jpe?g|gif|vnc.microsoft.icon|x-icon)$/i |