Merge remote-tracking branch 'origin/master'

This commit is contained in:
zxm 2018-02-07 20:07:26 +08:00
commit a921daa280
1 changed files with 1 additions and 1 deletions

View File

@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.