Merge branch 'ios-feature-mutli-context' of https://github.com/acton393/incubator-weex into ios-feature-mutli-context
# Conflicts: # ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8acf6354 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8acf6354 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8acf6354 Branch: refs/heads/master Commit: 8acf6354665896379960ae74d6a2efde3c2b895b Parents: 3ed7e1d ecfb4ee Author: acton393 <[email protected]> Authored: Wed Dec 20 22:35:18 2017 +0800 Committer: acton393 <[email protected]> Committed: Wed Dec 20 22:35:18 2017 +0800 ---------------------------------------------------------------------- ----------------------------------------------------------------------
