1. 15 Jan, 2020 3 commits
    • Star Diao's avatar
      Merge remote-tracking branch 'remotes/origin/master' into release · 40bdcc85
      Star Diao authored
      # Conflicts:
      #	README.md
      #	platforms/android/GSST/nexus/build.gradle
      #	platforms/android/GSST/nexus/src/main/java/com/eros/framework/model/PlatformConfigBean.java
      #	platforms/android/GSST/nexus/src/main/java/com/eros/widget/utils/BaseCommonUtil.java
      #	platforms/android/GSST/nexus/src/main/java/com/eros/widget/view/BMLoding.java
      #	platforms/android/GSST/nexus/src/main/java/com/eros/widget/view/loading/LoadingDialog.java
      40bdcc85
    • Star Diao's avatar
      delete some plugins · ce894a8c
      Star Diao authored
      ce894a8c
    • Star Diao's avatar
      add nexus · 7c4bf69f
      Star Diao authored
      7c4bf69f
  2. 11 Dec, 2019 3 commits
  3. 10 Oct, 2019 5 commits
  4. 11 Apr, 2019 1 commit
  5. 15 Mar, 2019 1 commit