Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,243 Commits 64 Branches 1,256 Tags
c67c367103f4ee8a7627c5ecb44cbfa9a753abcd
Commit Graph

3027 Commits

Author SHA1 Message Date
Sabe Jones 3da599cd05 Merge branch 'release' into develop 2021-02-25 16:04:35 -06:00
Sabe Jones a459e54586 feat(content): March Mystery Items 2021-02-25 15:51:17 -06:00
Sabe Jones 13bbafa9c4 Merge branch 'release' into develop 2021-02-16 17:30:02 -06:00
Sabe Jones ee1f95bb67 feat(content): bundle and cheevo 2021-02-16 17:00:39 -06:00
negue 63490a4c6c Storybook: disable DuplicatesPlugin while running in storybook:serve (#13014) 
* disable DuplicatesPlugin while running in storybook:serve
 2021-02-15 22:46:05 +01:00
Sabe Jones 05f6c6816f fix(event): Valentines does not have class outfits 2021-02-09 18:01:12 -06:00
Sabe Jones aa227f9861 fix(background): icon sprite correction from Dec 2021-02-03 13:15:05 -06:00
Sabe Jones 1ffa6359a9 fix(backgrounds): add missing icons 2021-02-03 11:21:43 -06:00
Sabe Jones 24904df79a chore(sprites): compile 2021-02-02 17:07:19 -06:00
Sabe Jones 10030b5281 feat(content): February 2021 Mystery Items 2021-02-01 14:52:28 -06:00
Sabe Jones 6dbbdd8070 feat(content): Habitica Birthday 2021 2021-01-28 16:56:01 -06:00
Sabe Jones 91fc5a931c Revert "build(deps): bump bootstrap from 4.5.3 to 4.6.0 in /website/client (#13004)" 
This reverts commit a6f0893ee4.
 2021-01-25 17:02:51 -06:00
Bart Enkelaar a543531956 Fix error logs in client unit tests from setTitle (#12967) 2021-01-25 16:52:26 -06:00
shantanu96 43fc390e28 #12970 Fixed 'String " not found' bug in categories while saving guild descr… (#12989) 
* Fixed 'String " not found' bug in categories while saving guild description

* syntax changes
 2021-01-25 16:44:52 -06:00
dependabot-preview[bot] c6cf4cfc75 build(deps): bump vue-cli-plugin-storybook in /website/client (#13008) 
Bumps [vue-cli-plugin-storybook](https://github.com/storybooks/vue-cli-plugin-storybook) from 0.6.1 to 2.0.0.
- [Release notes](https://github.com/storybooks/vue-cli-plugin-storybook/releases)
- [Changelog](https://github.com/storybookjs/vue-cli-plugin-storybook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/storybooks/vue-cli-plugin-storybook/compare/v0.6.1...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 16:12:51 -06:00
dependabot-preview[bot] f60fd85dea build(deps): bump @storybook/vue in /website/client (#12996) 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.19 to 6.1.15.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.1.15/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:54:45 -06:00
dependabot-preview[bot] 9a01255f41 build(deps): bump @storybook/addon-knobs in /website/client (#12994) 
Bumps [@storybook/addon-knobs](https://github.com/storybookjs/storybook/tree/HEAD/addons/knobs) from 5.3.19 to 6.1.15.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.1.15/addons/knobs)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:35:53 -06:00
dependabot-preview[bot] 475ad8deb1 build(deps): bump webpack from 4.45.0 to 4.46.0 in /website/client (#12983) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.45.0 to 4.46.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.45.0...v4.46.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:33:51 -06:00
dependabot-preview[bot] 92ae0ddf54 build(deps): bump @storybook/addon-links in /website/client (#12997) 
Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 5.3.19 to 6.1.15.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.1.15/addons/links)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:31:10 -06:00
dependabot-preview[bot] f856ee6a09 build(deps): bump @vue/cli-service in /website/client (#13001) 
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 4.5.10 to 4.5.11.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.11/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.11/packages/@vue/cli-service)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:10:50 -06:00
dependabot-preview[bot] b8d459be1c build(deps): bump @vue/cli-plugin-router in /website/client (#12998) 
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router) from 4.5.10 to 4.5.11.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.11/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.11/packages/@vue/cli-plugin-router)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:10:10 -06:00
dependabot-preview[bot] 93ee7cd5c9 build(deps): bump @vue/cli-plugin-babel in /website/client (#13000) 
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel) from 4.5.10 to 4.5.11.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.11/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.11/packages/@vue/cli-plugin-babel)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:09:53 -06:00
dependabot-preview[bot] fced7f52d9 build(deps): bump amplitude-js from 7.4.0 to 7.4.1 in /website/client (#12985) 
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 7.4.0 to 7.4.1.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases)
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/main/CHANGELOG.md)
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v7.4.0...v7.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:07:55 -06:00
dependabot-preview[bot] cf03bf11ae build(deps): bump sass from 1.32.2 to 1.32.5 in /website/client (#12999) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.32.2 to 1.32.5.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.32.2...1.32.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:04:24 -06:00
dependabot-preview[bot] 4b08451e53 build(deps): bump inspectpack from 4.5.2 to 4.6.1 in /website/client (#12995) 
Bumps [inspectpack](https://github.com/FormidableLabs/inspectpack) from 4.5.2 to 4.6.1.
- [Release notes](https://github.com/FormidableLabs/inspectpack/releases)
- [Changelog](https://github.com/FormidableLabs/inspectpack/blob/master/HISTORY.md)
- [Commits](https://github.com/FormidableLabs/inspectpack/compare/v4.5.2...v4.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 15:02:41 -06:00
dependabot-preview[bot] ca882c83ea build(deps): bump core-js from 3.8.2 to 3.8.3 in /website/client (#13003) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.8.2 to 3.8.3.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.8.2...v3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 14:57:05 -06:00
dependabot-preview[bot] a6f0893ee4 build(deps): bump bootstrap from 4.5.3 to 4.6.0 in /website/client (#13004) 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.5.3 to 4.6.0.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.5.3...v4.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 14:56:46 -06:00
dependabot-preview[bot] 7208740fb6 build(deps): bump @storybook/addon-actions in /website/client (#13005) 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.19 to 6.1.15.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.1.15/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 14:56:00 -06:00
dependabot-preview[bot] e596ea6f03 build(deps): bump @vue/cli-plugin-unit-mocha in /website/client (#13006) 
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha) from 4.5.10 to 4.5.11.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.11/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.11/packages/@vue/cli-plugin-unit-mocha)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 14:52:25 -06:00
dependabot-preview[bot] 5ee2d4a0e5 build(deps): bump @vue/cli-plugin-eslint in /website/client (#13007) 
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 4.5.10 to 4.5.11.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v4.5.11/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.11/packages/@vue/cli-plugin-eslint)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-25 14:52:03 -06:00
dependabot-preview[bot] 5f7e3fa4e7 build(deps): bump @vue/cli-service in /website/client (#12957) 
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 4.5.9 to 4.5.10.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.10/packages/@vue/cli-service)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 12:38:24 +01:00
dependabot-preview[bot] fde2359334 build(deps): bump @vue/cli-plugin-router in /website/client (#12960) 
Bumps [@vue/cli-plugin-router](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-router) from 4.5.9 to 4.5.10.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.10/packages/@vue/cli-plugin-router)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 12:38:07 +01:00
dependabot-preview[bot] 95c8958e13 build(deps): bump sass from 1.32.0 to 1.32.2 in /website/client (#12961) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.32.0 to 1.32.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.32.0...1.32.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 12:37:51 +01:00
dependabot-preview[bot] 28e09d3905 build(deps): bump @vue/cli-plugin-babel in /website/client (#12954) 
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel) from 4.5.9 to 4.5.10.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.10/packages/@vue/cli-plugin-babel)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 11:50:42 +01:00
dependabot-preview[bot] 85b1b49950 build(deps): bump webpack from 4.44.2 to 4.45.0 in /website/client (#12958) 
Bumps [webpack](https://github.com/webpack/webpack) from 4.44.2 to 4.45.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.44.2...v4.45.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 11:34:06 +01:00
dependabot-preview[bot] e19c24024a build(deps): bump @vue/cli-plugin-unit-mocha in /website/client (#12956) 
Bumps [@vue/cli-plugin-unit-mocha](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-mocha) from 4.5.9 to 4.5.10.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.10/packages/@vue/cli-plugin-unit-mocha)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 11:33:48 +01:00
dependabot-preview[bot] 2cbceef84b build(deps): bump @vue/cli-plugin-eslint in /website/client (#12952) 
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 4.5.9 to 4.5.10.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.5.10/packages/@vue/cli-plugin-eslint)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 11:33:30 +01:00
dependabot-preview[bot] a308796672 build(deps): bump nconf from 0.11.0 to 0.11.1 in /website/client (#12953) 
Bumps [nconf](https://github.com/flatiron/nconf) from 0.11.0 to 0.11.1.
- [Release notes](https://github.com/flatiron/nconf/releases)
- [Changelog](https://github.com/indexzero/nconf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flatiron/nconf/compare/v0.11.0...v0.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 11:33:12 +01:00
dependabot-preview[bot] b978234531 build(deps): bump amplitude-js from 7.3.3 to 7.4.0 in /website/client (#12955) 
Bumps [amplitude-js](https://github.com/amplitude/amplitude-javascript) from 7.3.3 to 7.4.0.
- [Release notes](https://github.com/amplitude/amplitude-javascript/releases)
- [Changelog](https://github.com/amplitude/Amplitude-JavaScript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/amplitude/amplitude-javascript/compare/v7.3.3...v7.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-11 11:32:55 +01:00
Alys 9d93821758 remove mentiod of Back Corner from Community Guidelines. (#12901) 
This includes deleting the Back Corner image.
 2021-01-07 17:31:42 +01:00
Óscar Carretero 14e99c6e6c Remove forum link (#12917) 
* remove forum link

* remove `communityForum` from locales
 2021-01-07 17:30:39 +01:00
Sabe Jones c68c8536de Merge branch 'release' into develop 2021-01-05 15:41:35 -06:00
Sabe Jones 845fcd41b4 chore(sprites): compile 2021-01-04 15:30:48 -06:00
Sabe Jones f172670aa4 feat(content): BGs and Armoire Jan 2021 2021-01-04 15:30:39 -06:00
dependabot-preview[bot] 7222ee0a10 build(deps): bump core-js from 3.8.1 to 3.8.2 in /website/client (#12929) 
Bumps [core-js](https://github.com/zloirock/core-js) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.8.1...v3.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-04 15:28:58 +01:00
dependabot-preview[bot] 87e46da6a3 build(deps): bump sass from 1.30.0 to 1.32.0 in /website/client (#12928) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.30.0 to 1.32.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.30.0...1.32.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-04 15:26:21 +01:00
dependabot-preview[bot] d8199f71a8 build(deps): bump bootstrap-vue from 2.21.1 to 2.21.2 in /website/client (#12930) 
Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.21.1 to 2.21.2.
- [Release notes](https://github.com/bootstrap-vue/bootstrap-vue/releases)
- [Changelog](https://github.com/bootstrap-vue/bootstrap-vue/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.21.1...v2.21.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2021-01-04 15:26:01 +01:00
Matteo Pagliazzi 20a6103457 Merge branch 'release' into develop 2021-01-02 17:51:59 +01:00
Sabe Jones b2adc29bf6 feat(content): 2021 January Mystery 2020-12-30 16:43:32 -06:00
Sabe Jones 920ee56bdf Merge branch 'release' into develop 2020-12-29 18:59:38 -06:00