• yueming lu's avatar
    Merge branch 'master' into lym/phobos · 759845fe
    yueming lu authored
    * master: (23 commits)
      Bump version to 2.1.6
      Bump version to 2.1.5
      无效的小改
      修改bug
      Bump version to 2.1.5
      修改bug
      Bump version to 2.1.4
      修改isFirst 避免冲突
      Bump version to 2.1.3
      修改isFirst 问题
      Bump version to 2.1.2
      修改is_first赋值位置
      Bump version to 2.1.1
      modify phobos isfirst 类型
      Bump version to 2.1.0
      暂提
      修改is_first逻辑
      Bump version to 2.0.9
      修改类型转换
      暂提
      ...
    
    # Conflicts:
    #	Example/GMPhobos/GMViewController.m
    #	Example/Podfile.lock
    759845fe
Analyzing file…