Commit 6f3bcefb authored by echel0n's avatar echel0n

Merge branch 'develop'

parents 0c94d20d 9628b365
......@@ -238,9 +238,11 @@ module.exports = function (grunt) {
//'sync_trans',
'bump_version:' + newVersion,
'exec:git_commit:Release v' + newVersion,
'exec:git_last_tag', 'exec:git_list_changes', 'exec:git_tag:' + newVersion,
'exec:git:checkout:master',
'exec:git:merge:develop',
'exec:git_last_tag', 'exec:git_list_changes', 'exec:git_tag:' + newVersion,
'exec:git:checkout:develop',
'exec:git:merge:--no-ff:master',
'exec:git_push:origin:develop:tags',
'exec:git_push:origin:master:tags',
'exec:pypi_create',
......
# Changelog
- * 705d0bda1 - 2019-07-13: Release v9.4.128
- * 45aab9af9 - 2019-07-13: Release v9.4.127
- * 32308beb6 - 2019-07-13: Release v9.4.126
- * a411278c6 - 2019-07-13: Release v9.4.125
......
9.4.128
\ No newline at end of file
9.4.129
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment