[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Releases: AniTrend/support-markdown

v0.1.6

07 Dec 19:56
e040fff
Compare
Choose a tag to compare

What's Changed

📦 Dependencies

27 changes
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.7.2 by @renovate in #274
  • fix(deps): update dependency com.android.tools.build:gradle to v8.7.3 by @renovate in #273
  • fix(deps): update dependency org.jsoup:jsoup to v1.18.3 by @renovate in #272
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.7.1 by @renovate in #271
  • fix(deps): update kotlin monorepo to v2.1.0 by @renovate in #270
  • fix(deps): update dependency org.jsoup:jsoup to v1.18.2 by @renovate in #269
  • fix(deps): update dependency com.jakewharton.threetenabp:threetenabp to v1.4.8 by @renovate in #268
  • chore(deps): update dependency gradle to v8.11.1 by @renovate in #267
  • fix(deps): update androidx.paging to v3.3.4 by @renovate in #266
  • chore(deps): update dependency gradle to v8.11 by @renovate in #265
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.6.9 by @renovate in #264
  • chore(deps): update mikepenz/action-junit-report action to v5 by @renovate in #263
  • fix(deps): update dependency com.android.tools.build:gradle to v8.7.2 by @renovate in #262
  • fix(deps): update dependency androidx.core:core-ktx to v1.15.0 by @renovate in #261
  • fix(deps): update androidx.lifecycle to v2.8.7 by @renovate in #259
  • fix(deps): update dependency androidx.constraintlayout:constraintlayout to v2.2.0 by @renovate in #260
  • fix(deps): update androidx.fragment to v1.8.5 by @renovate in #258
  • fix(deps): update dependency androidx.activity:activity-ktx to v1.9.3 - autoclosed by @renovate in #257
  • fix(deps): update dependency com.android.tools.build:gradle to v8.7.1 by @renovate in #256
  • fix(deps): update dependency org.jetbrains:annotations to v26.0.1 by @renovate in #255
  • fix(deps): update kotlin monorepo to v2.0.21 by @renovate in #254
  • fix(deps): update mockk to v1.13.13 by @renovate in #253
  • fix(deps): update dependency org.jetbrains:annotations to v26 by @renovate in #252
  • fix(deps): update androidx.fragment to v1.8.4 by @renovate in #250
  • fix(deps): update dependency com.android.tools.build:gradle to v8.7.0 by @renovate in #249
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.6.8 by @renovate in #247
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.6.8 by @renovate in #245

Full Changelog: 0.1.5...v0.1.6

v0.1.5

25 Sep 18:46
Compare
Choose a tag to compare

What's Changed

📦 Dependencies

8 changes
  • fix(deps): update dependency org.jetbrains:annotations to v25 by @renovate in #244
  • chore(deps): update dependency gradle to v8.10.2 by @renovate in #243
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.3 by @renovate in #242
  • fix(deps): update dependency androidx.startup:startup-runtime to v1.2.0 by @renovate in #241
  • fix(deps): update androidx.lifecycle to v2.8.6 by @renovate in #240
  • fix(deps): update dependency com.android.tools.build:gradle to v8.6.1 by @renovate in #239
  • fix(deps): update koin to v4 (major) by @renovate in #237
  • fix(deps): update dependency io.insert-koin:koin-android to v4 by @renovate in #236

Full Changelog: 0.1.4...v0.1.5

v0.1.4

15 Sep 08:29
Compare
Choose a tag to compare

What's Changed

📦 Dependencies

22 changes
  • fix(deps): update jetbrains.kotlinx.coroutines to v1.9.0 by @renovate in #235
  • chore(deps): update dependency gradle to v8.10.1 - autoclosed by @renovate in #234
  • fix(deps): update dependency androidx.activity:activity-ktx to v1.9.2 by @renovate in #233
  • fix(deps): update androidx.lifecycle to v2.8.5 by @renovate in #232
  • fix(deps): update androidx.fragment to v1.8.3 by @renovate in #231
  • chore(deps): update peter-evans/create-pull-request action to v7 by @renovate in #230
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.6.4 - autoclosed by @renovate in #229
  • fix(deps): update dependency com.android.tools.build:gradle to v8.6.0 by @renovate in #228
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.2 by @renovate in #227
  • fix(deps): update kotlin monorepo to v2.0.20 by @renovate in #226
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-datetime to v0.6.1 by @renovate in #225
  • fix(deps): update dependency androidx.test:runner to v1.6.2 by @renovate in #224
  • chore(deps): update dependency gradle to v8.10 by @renovate in #223
  • fix(deps): update androidx.paging to v3.3.2 by @renovate in #221
  • fix(deps): update kotlin monorepo to v2.0.10 by @renovate in #220
  • fix(deps): update dependency com.android.tools.build:gradle to v8.5.2 by @renovate in #222
  • fix(deps): update androidx.lifecycle to v2.8.4 by @renovate in #217
  • fix(deps): update dependency androidx.activity:activity-ktx to v1.9.1 by @renovate in #219
  • fix(deps): update androidx.paging to v3.3.1 by @renovate in #218
  • fix(deps): update androidx.fragment to v1.8.2 by @renovate in #216
  • fix(deps): update coil to v2.7.0 by @renovate in #215
  • fix(deps): update mockk to v1.13.12 by @renovate in #213

Full Changelog: 0.1.3...v0.1.4

v0.1.3

15 Jul 09:43
Compare
Choose a tag to compare

What's Changed

🛠️ Bug Fixes

📦 Dependencies

69 changes
  • fix(deps): update dependency com.android.tools.build:gradle to v8.5.1 by @renovate in #212
  • fix(deps): update dependency com.apollographql.apollo3:apollo-runtime to v3.8.5 by @renovate in #211
  • chore(deps): update dependency gradle to v8.9 - autoclosed by @renovate in #210
  • chore(deps): update plugin com.apollographql.apollo3 to v3.8.5 by @renovate in #209
  • fix(deps): update dependency org.jsoup:jsoup to v1.18.1 by @renovate in #208
  • fix(deps): update androidx.lifecycle to v2.8.3 by @renovate in #207
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.6.3 by @renovate in #206
  • fix(deps): update dependency androidx.test:runner to v1.6.1 by @renovate in #204
  • fix(deps): update dependency androidx.test:rules to v1.6.1 by @renovate in #205
  • fix(deps): update dependency androidx.test:core-ktx to v1.6.1 by @renovate in #203
  • fix(deps): update dependency androidx.test.ext:junit-ktx to v1.2.1 by @renovate in #202
  • fix(deps): update androidx.fragment to v1.8.1 by @renovate in #201
  • fix(deps): update dependency androidx.test:runner to v1.6.0 by @renovate in #198
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.1 by @renovate in #200
  • fix(deps): update dependency androidx.test:rules to v1.6.0 by @renovate in #199
  • fix(deps): update dependency androidx.test:core-ktx to v1.6.0 by @renovate in #197
  • fix(deps): update dependency androidx.test.ext:junit-ktx to v1.2.0 by @renovate in #196
  • fix(deps): update androidx.fragment to v1.8.0 by @renovate in #194
  • fix(deps): update dependency com.android.tools.build:gradle to v8.5.0 by @renovate in #195
  • fix(deps): update androidx.lifecycle to v2.8.2 by @renovate in #193
  • fix(deps): update dependency com.android.tools.build:gradle to v8.4.2 by @renovate in #192
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.7.0 by @renovate in #191
  • chore(deps): update dependency gradle to v8.8 by @renovate in #190
  • fix(deps): update androidx.lifecycle to v2.8.1 by @renovate in #189
  • fix(deps): update kotlin monorepo to v2 (major) by @renovate in #188
  • fix(deps): update dependency com.android.tools.build:gradle to v8.4.1 by @renovate in #187
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.6.1 by @renovate in #186
  • fix(deps): update mockk to v1.13.11 by @renovate in #185
  • fix(deps): update androidx.lifecycle to v2.8.0 by @renovate in #182
  • fix(deps): update jetbrains.kotlinx.coroutines to v1.8.1 by @renovate in #180
  • fix(deps): update androidx.paging to v3.3.0 by @renovate in #183
  • fix(deps): update androidx.fragment to v1.7.1 by @renovate in #181
  • fix(deps): update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.25.0 by @renovate in #142
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-datetime to v0.6.0 by @renovate in #184
  • fix(deps): update kotlin monorepo to v1.9.24 by @renovate in #179
  • fix(deps): update androidx.fragment to v1.7.0 by @renovate in #177
  • fix(deps): update dependency com.google.android.material:material to v1.12.0 by @renovate in #178
  • fix(deps): update dependency androidx.core:core-ktx to v1.13.1 by @renovate in #176
  • fix(deps): update dependency com.android.tools.build:gradle to v8.4.0 by @renovate in #175
  • fix(deps): update dependency com.apollographql.apollo3:apollo-runtime to v3.8.4 by @renovate in #174
  • chore(deps): update plugin com.apollographql.apollo3 to v3.8.4 by @renovate in #173
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.6.0 by @renovate in #170
  • fix(deps): update dependency androidx.core:core-ktx to v1.13.0 by @renovate in #172
  • fix(deps): update dependency androidx.activity:activity-ktx to v1.9.0 by @renovate in #171
  • fix(deps): update dependency io.insert-koin:koin-android to v3.5.6 by @renovate in #167
  • fix(deps): update koin to v3.5.6 by @renovate in #168
  • chore(deps): update gradle/wrapper-validation-action action to v3 by @renovate in #169
  • fix(deps): update dependency io.insert-koin:koin-android to v3.5.5 by @renovate in #165
  • fix(deps): update koin to v3.5.5 by @renovate in #166
  • fix(deps): update dependency com.android.tools.build:gradle to v8.3.2 by @renovate in #163
  • fix(deps): update koin to v3.5.4 by @renovate in #162
  • chore(deps): update plugin com.apollographql.apollo3 to v3.8.3 by @renovate in #156
  • fix(deps): update dependency io.insert-koin:koin-android to v3.5.4 by @renovate in #161
  • chore(deps): update gradle/gradle-build-action action to v3 by @renovate in #160
  • fix(deps): update dependency com.jakewharton.threetenabp:threetenabp to v1.4.7 by @renovate in #159
  • chore(deps): update dependency gradle to v8.7 by @renovate in #158
  • fix(deps): update dependency com.apollographql.apollo3:apollo-runtime to v3.8.3 by @renovate in #157
  • fix(deps): update dependency com.android.tools.build:gradle to v8.3.1 by @renovate in #155
  • fix(deps): update kotlin monorepo to v1.9.23 by @renovate in #154
  • fix(deps): update dependency org.jetbrains.dokka:dokka-gradle-plugin to v1.9.20 by @renovate in #153
  • fix(deps): update dependency com.android.tools.build:gradle to v8.3.0 by @renovate in #152
  • fix(deps): update mockk to v1.13.10 by @renovate in #151
  • fix(deps): update coil to v2.6.0 by @renovate in #150
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.6.3 by @renovate in #149
  • fix(deps): update jetbrains.kotlinx.coroutines to v1.8.0 by @renovate in #148
  • chore(deps): update release-drafter/release-drafter action to v6 by @renovate in #146
  • chore(deps): update dependency gradle to v8.6 by @renovate in #147
  • chore(deps): update gradle/wrapper-validation-action action to v2 by @renovate in #145
  • fix(deps): update dependency com.android.tools.build:gradle to v8.2.2 by @renovate in #144

Full Changelog: 0.1.2...v0.1.3

v0.1.2

22 Jan 20:11
b291d4f
Compare
Choose a tag to compare

What's Changed

📦 Dependencies

19 changes
  • chore(deps): update plugin gradle-versions to v0.51.0 by @renovate in #143
  • fix(deps): update androidx.lifecycle to v2.7.0 by @renovate in #141
  • fix(deps): update mockk to v1.13.9 by @renovate in #140
  • fix(deps): update dependency com.android.tools.build:gradle to v8.2.1 by @renovate in #139
  • fix(deps): update dependency org.jsoup:jsoup to v1.17.2 by @renovate in #138
  • fix(deps): update kotlin monorepo to v1.9.22 by @renovate in #137
  • fix(deps): update koin to v3.5.3 by @renovate in #135
  • fix(deps): update dependency io.insert-koin:koin-android to v3.5.3 by @renovate in #136
  • fix(deps): update dependency com.google.android.material:material to v1.11.0 by @renovate in #134
  • fix(deps): update dependency androidx.activity:activity-ktx to v1.8.2 by @renovate in #133
  • chore(deps): update actions/stale action to v9 by @renovate in #132
  • fix(deps): update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.23.3 by @renovate in #125
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-datetime to v0.5.0 by @renovate in #131
  • fix(deps): update dependency com.android.tools.build:gradle to v8.2.0 by @renovate in #130
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.6.2 by @renovate in #129
  • chore(deps): update actions/setup-java action to v4 by @renovate in #128
  • chore(deps): update dependency gradle to v8.5 by @renovate in #127
  • chore(deps): update jamesives/github-pages-deploy-action action to v4.5.0 by @renovate in #126
  • fix(deps): update dependency org.jsoup:jsoup to v1.17.1 by @renovate in #124

Full Changelog: 0.1.1...v0.1.2

v0.1.1

25 Nov 20:52
f111504
Compare
Choose a tag to compare

What's Changed

📦 Dependencies

6 changes
  • fix(deps): update kotlin monorepo to v1.9.21 by @renovate in #123
  • chore(deps): update plugin gradle-versions to v0.50.0 by @renovate in #122
  • fix(deps): update dependency com.android.tools.build:gradle to v8.1.4 by @renovate in #121
  • fix(deps): update dependency androidx.activity:activity-ktx to v1.8.1 by @renovate in #120
  • fix(deps): update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.6.1 by @renovate in #119
  • fix(deps): update dependency org.jetbrains:annotations to v24.1.0 by @renovate in #118

Full Changelog: 0.1.0...v0.1.1

v0.1.0

09 Nov 08:42
9b4e879
Compare
Choose a tag to compare

What's Changed

📦 Dependencies

108 changes
  • Update dependency com.android.tools.build:gradle to v8.1.3 by @renovate in #116
  • Update androidx.fragment to v1.6.2 by @renovate in #115
  • Update coil to v2.5.0 by @renovate in #114
  • Update kotlin monorepo to v1.9.20 by @renovate in #113
  • Update dependency org.jsoup:jsoup to v1.16.2 by @renovate in #112
  • Update dependency androidx.recyclerview:recyclerview to v1.3.2 by @renovate in #111
  • Update dependency org.jetbrains.dokka:dokka-gradle-plugin to v1.9.10 by @renovate in #109
  • Update release-drafter/release-drafter action to v5.25.0 by @renovate in #110
  • Update plugin gradle-versions to v0.49.0 by @renovate in #108
  • Update dependency com.google.android.material:material to v1.10.0 by @renovate in #106
  • Update dependency androidx.activity:activity-ktx to v1.8.0 by @renovate in #104
  • Update dependency gradle to v8.4 by @renovate in #105
  • Update stefanzweifel/git-auto-commit-action action to v5 by @renovate in #107
  • Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.22.0 by @renovate in #103
  • Update dependency com.android.tools.build:gradle to v8.1.2 by @renovate in #102
  • Update dependency org.jetbrains.dokka:dokka-gradle-plugin to v1.9.0 by @renovate in #90
  • Update plugin gradle-versions to v0.48.0 by @renovate in #97
  • Update mockk to v1.13.8 by @renovate in #100
  • Update dependency io.insert-koin:koin-android to v3.5.0 by @renovate in #98
  • Update koin to v3.5.0 by @renovate in #99
  • Update dependency androidx.core:core-ktx to v1.12.0 by @renovate in #96
  • Update androidx.paging to v3.2.1 by @renovate in #95
  • Update androidx.lifecycle to v2.6.2 by @renovate in #94
  • Update mikepenz/action-junit-report action to v4 by @renovate in #93
  • Update actions/checkout action to v4 by @renovate in #92
  • Update dependency org.jetbrains.kotlinx:kotlinx-datetime to v0.4.1 by @renovate in #91
  • Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.21.0 by @renovate in #89
  • Update kotlin monorepo to v1.9.10 by @renovate in #88
  • Update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.6.0 by @renovate in #87
  • Update dependency com.android.tools.build:gradle to v8.1.1 by @renovate in #86
  • Update dependency gradle to v8.3 by @renovate in #85
  • Update mockk to v1.13.7 by @renovate in #84
  • Update androidx.paging to v3.2.0 by @renovate in #81
  • Update dependency io.insert-koin:koin-android to v3.4.3 by @renovate in #82
  • Update dependency com.android.tools.build:gradle to v8.1.0 by @renovate in #78
  • Update jetbrains.kotlinx.coroutines to v1.7.3 by @renovate in #77
  • Update androidx.fragment to v1.6.1 by @renovate in #79
  • Update dependency androidx.recyclerview:recyclerview to v1.3.1 by @renovate in #80
  • Update koin to v3.4.3 by @renovate in #83
  • Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.20.0 by @renovate in #76
  • Update kotlin monorepo to v1.9.0 by @renovate in #73
  • Update JamesIves/github-pages-deploy-action action to v4.4.3 by @renovate in #75
  • Update dependency gradle to v8.2.1 by @renovate in #74
  • Update dependency gradle to v8.2 by @renovate in #72
  • Update jetbrains.kotlinx.coroutines to v1.7.2 by @renovate in #71
  • Update plugin gradle-versions to v0.47.0 by @renovate in #70
  • Update androidx.fragment to v1.6.0 by @renovate in #69
  • Update kotlin monorepo to v1.8.22 by @renovate in #68
  • Update dependency io.insert-koin:koin-core to v3.4.2 by @renovate in #66
  • Update dependency org.jetbrains.dokka:dokka-gradle-plugin to v1.8.20 by @renovate in #67
  • Update dependency io.insert-koin:koin-android to v3.4.2 by @renovate in #65
  • Update dependency io.insert-koin:koin-android to v3.4.1 by @renovate in #64
  • Update koin to v3.4.1 by @renovate in #62
  • Update dependency com.android.tools.build:gradle to v8 by @renovate in #42
  • Update dependency androidx.activity:activity-ktx to v1.7.2 by @renovate in #58
  • Update JamesIves/github-pages-deploy-action action to v4.4.2 by @renovate in #61
  • Update plugin com.apollographql.apollo3 to v3.8.2 by @renovate in #59
  • Update dependency com.apollographql.apollo3:apollo-runtime to v3.8.2 by @renovate in #60
  • Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.19.0 by @renovate in #57
  • Update coil to v2.4.0 by @renovate in #56
  • Update jetbrains-kotlinx-coroutines to v1.7.1 by @renovate in #55
  • Update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.5.1 by @renovate in #54
  • Update dependency androidx.core:core-ktx to v1.10.1 by @renovate in #53
  • Update jetbrains-kotlinx-coroutines to v1.7.0 by @renovate in #52
  • Update dependency com.google.android.material:material to v1.9.0 by @renovate in #51
  • Update dependency org.jsoup:jsoup to v1.16.1 by @renovate in #50
  • Update kotlin monorepo to v1.8.21 by @renovate in #49
  • Update plugin com.apollographql.apollo3 to v3.8.1 by @renovate in #48
  • Update dependency gradle to v8.1.1 by @renovate in #47
  • Update dependency com.apollographql.apollo3:apollo-runtime to v3.8.1 by @renovate in #46
  • Update dependency androidx.activity:activity-ktx to v1.7.1 by @renovate in #45
  • Update androidx-fragment to v1.5.7 by @renovate in #44
  • Update dependency com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter to v1 by @renovate in #43
  • Update dependency gradle to v8.1 by @renovate in #41
  • Update mockk to v1.13.5 by @renovate in #40
  • Update dependency androidx.core:core-ktx to v1.10.0 by @renovate in #38
  • Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.18.0 by @renovate in #39
  • Update dependency com.apollographql.apollo3:apollo-runtime to v3.8.0 by @renovate in #37
  • Update plugin com.apollographql.apollo3 to v3.8.0 by @renovate in #36
  • Update kotlin monorepo to v1.8.20 by @renovate in #35
  • Update dependency com.jakewharton.threetenabp:threetenabp to v1.4.6 by @renovate in #34
  • Update coil to v2.3.0 by @renovate in #33
  • Update koin to v3.4.0 by @renovate in #32
  • Update dependency io.insert-koin:koin-android to v3.4.0 by @renovate in #31
  • Update dependency androidx.activity:activity-ktx to v1.7.0 by @renovate in #29
  • Update androidx-lifecycle to v2.6.1 by @renovate in #28
  • Update actions/stale action to v8 by @renovate in #30
  • Update androidx-fragment to v1.5.6 by @renovate in #27
  • Update plugin com.apollographql.apollo3 to v3.7.5 by @renovate in #25
  • Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.17.0 by @renovate in #24
  • Update dependency com.apollographql.apollo3:apollo-runtime to v3.7.5 by @renovate in #26
  • Update kotlin monorepo to v1.8.10 by @renovate in #16
  • Update dependency org.jetbrains.dokka:dokka-gradle-plugin to v1.8.10 by @renovate in #21
  • Update dependency org.jetbrains:annotations to v24 by @renovate in #20
  • Update androidx-lifecycle to v2.6.0 by @renovate in #23
  • Update dependency androidx.recyclerview:recyclerview to v1.3.0 by @renovate in #22
  • Update dependency gradle to v8 by @renovate in #19
  • Update dependency io.insert-koin:koin-android to v3.3.3 by @renovate in #14
  • Update plugin com.apollographql.apollo3 to v3.7.4 by @renovate in #11
  • Update koin to v3.3.3 by @renovate in #15
  • Update actions/checkout action to v3 by @renovate in #17
  • Update actions/stale action to v7 by @renovate in #18
  • Update dependency gradle to v7.6.1 by @renovate in #13
  • Update dependency com.diffplug.spotless:spotless-plugin-gradle to v6.16.0 by @renovate in #12
  • Update dependency org.jetbrains:annotations to v16.0.3 by @renovate in #10
  • Update dependency com.apollographql.apollo3:apollo-runtime to v3.7.4 by @renovate in #8
  • Update dependency com.android.tools.build:gradle to v7.4.2 by @renovate in #7
  • Configure Renovate by @renovate in #6

🔖 Other changes

  • chore(docs): change license to Apache v2.0 by @wax911 in #117
  • Rework EmphasisPlugin and ItalicsPlugin by @luk1337 in #3
  • Rework the way we handle text input in HeadingPlugin by @luk1337 in #1

Full Changelog: ...v0.1.0

v0.12.0-alpha01

20 Mar 19:47
Compare
Choose a tag to compare
v0.12.0-alpha01 Pre-release
Pre-release
Merge branch 'develop'