Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes #18

Merged
merged 12 commits into from
May 6, 2024
Merged

Various fixes #18

merged 12 commits into from
May 6, 2024

Conversation

maehr
Copy link
Owner

@maehr maehr commented May 6, 2024

Pull request

Proposed changes

Types of changes

  • New feature (non-breaking change which adds functionality).
  • Enhancement (non-breaking change which enhances functionality)
  • Bug Fix (non-breaking change which fixes an issue).
  • Breaking change (fix or feature that would cause existing functionality to change).

Checklist

  • I have read the README document.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

Copy link

coderabbitai bot commented May 6, 2024

Walkthrough

The recent updates revolve around enhancing license management and presentation for a GitHub repository dedicated to open research data. Changes include configuring website settings in Quarto, updating license files and badges, and adding a new step in the GitHub workflow for proper setup before publishing.

Changes

File Path Change Summary
.github/_quarto.yml Introduced configurations for the open research data website.
.github/labeler.yml, README.template.md Updated license files to LICENSE-AGPL.md and LICENSE-CCBY.md, removing LICENSE.md. Updated license badges and URLs.
.github/workflows/quarto-publish.yml Added a step to overwrite _quarto.yml before Quarto setup.
README.md Updated license badges and URLs to point to new license files and added a DOI badge.

Poem

🌟🐰✨
In the realm of code and data,
Where bytes and bits do play,
A rabbit brings changes, fresh and true,
Badges gleam, licenses renew.
Hop, hop, hurray! Let's celebrate fate,
For open data, we elevate!
📜🎉🐇

` → `[![DOI](https://zenodo.org/badge/ZENODO_RECORD.svg)](https://zenodo.org/badge/latestdoi/ZENODO_RECORD)`

README.template.md: ## Short Summary
The change in functionality involves updating the license information in the README file of the repository. The URLs for the license badges have been modified to point to different license files, specifically LICENSE-AGPL.md for the code license and LICENSE-CCBY.md for the data license.

Alterations to the declarations of exported or public entities

  • [![GitHub license](https://img.shields.io/github/license/USERNAME/REPO_NAME.svg)](https://github.com/USERNAME/REPO_NAME/blob/main/LICENSE.md)
    [![Code license](https://img.shields.io/github/license/USERNAME/REPO_NAME.svg)](https://github.com/USERNAME/REPO_NAME/blob/main/LICENSE-AGPL.md) in README.template.md
  • [![GitHub license](https://img.shields.io/github/license/USERNAME/REPO_NAME.svg)](https://github.com/USERNAME/REPO_NAME/blob/main/LICENSE.md)
    [![Data license](https://img.shields.io/github/license/USERNAME/REPO_NAME.svg)](https://github.com/USERNAME/REPO_NAME/blob/main/LICENSE-CCBY.md) in README.template.md

-->
<!-- end of auto-generated comment: raw summary by coderabbit.ai --><!-- This is an auto-generated comment: short summary by coderabbit.ai -->
<!--


### PR Objectives (User Provided Facts)

The pull request titled "Various fixes" (PR #18) aims to introduce enhancements and bug fixes to the project. The changes proposed do not introduce any new features or breaking changes but focus on improving existing functionalities and resolving issues. The PR checklist confirms adherence to the project's documentation standards and includes updates to the documentation as required by the changes.

### AI-Generated Summary of Generated Summaries

This pull request encompasses a series of updates across multiple configuration and documentation files within the project's GitHub repository. Here's a detailed breakdown:

1. **Quarto Configuration Updates**:
   - The `.github/_quarto.yml` file has been configured to set up a website related to open research data. This includes settings for the website's title, URLs, navigation elements, sidebar contents, formatting options, and the choice of editor.

2. **License File Adjustments**:
   - The project's licensing documentation has undergone significant changes. The original `LICENSE.md` has been replaced with two new files: `LICENSE-AGPL.md` and `LICENSE-CCBY.md`. These changes are reflected in the `.github/labeler.yml` file, which now points to these new license files instead of the old one.

3. **GitHub Workflow Enhancements**:
   - A new step has been added to the `.github/workflows/quarto-publish.yml` workflow. This step involves overwriting the `_quarto.yml` file before setting up Quarto, ensuring that the latest configurations are used during the publishing process.

4. **README Updates**:
   - The `README.md` and `README.template.md` files have been updated to reflect the new licensing structure. The license badges and URLs have been updated to point to the new `LICENSE-AGPL.md` and `LICENSE-CCBY.md` files. Additionally, a DOI badge from Zenodo has been added to `README.md`, enhancing the repository's credibility and traceability.

These updates collectively enhance the project's documentation clarity, licensing transparency, and configuration management, ensuring that the project adheres to best practices in open research and data management.

### Alterations to the Declarations of Exported or Public Entities

- **.github/_quarto.yml**:
  - No alterations to the declarations of exported or public entities were made in this file.

- **.github/labeler.yml**:
  - Removed: `LICENSE.md`
  - Added: `LICENSE-AGPL.md`, `LICENSE-CCBY.md`

- **.github/workflows/quarto-publish.yml**:
  - No alterations to the declarations of exported or public entities were made in this file.

- **README.md**:
  - Changed:
    - From: `[![GitHub license](https://img.shields.io/github/license/maehr/open-research-data-template.svg)](https://github.com/maehr/open-research-data-template/blob/main/LICENSE.md)`
    - To: `[![Code license](https://img.shields.io/github/license/USERNAME/REPO_NAME.svg)](https://github.com/USERNAME/REPO_NAME/blob/main/LICENSE-AGPL.md)`
    - To: `[![Data license](https://img.shields.io/github/license/USERNAME/REPO_NAME.svg)](https://github.com/USERNAME/REPO_NAME/blob/main/LICENSE-CCBY.md)`
    - Added: `[![DOI](https://zenodo.org/badge/ZENODO_RECORD.svg)](https://zenodo.org/badge/latestdoi/ZENODO_RECORD)`

- **README.template.md**:
  - Changed:
    - From: `[![GitHub license](https://img.shields.io/github/license/USERNAME/REPO_NAME.svg)](https://github.com/USERNAME/REPO_NAME/blob/main/LICENSE.md)`
    - To: `[![Code license](https://img.shields.io/github/license/USERNAME/REPO_NAME.svg)](https://github.com/USERNAME/REPO_NAME/blob/main/LICENSE-AGPL.md)`
    - To: `[![Data license](https://img.shields.io/github/license/USERNAME/REPO_NAME.svg)](https://github.com/USERNAME/REPO_NAME/blob/main/LICENSE-CCBY.md)`

-->
<!-- end of auto-generated comment: short summary by coderabbit.ai --><!-- commit_ids_reviewed_start -->

<!-- 8610e0240f95e355cb6cbdc315371c86cec7b4d3 -->
<!-- 9566dcfec608903d6e00bc56217be51ce2cc285f -->
<!-- 7fb00b828c4dc00206503715cf5cd1f43298d80a -->

<!-- commit_ids_reviewed_end --><!-- tips_start -->

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

<details>
<summary>Share</summary>

- [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai)
- [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai)
- [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai)
- [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)

</details>

<details>
<summary>Tips</summary>

### Chat

There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai):

> Note: Auto-reply has been disabled for this repository by the repository owner. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.
- Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples:
	- `@coderabbitai generate unit testing code for this file.`
	-	`@coderabbitai modularize this function.`
- PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
	- `@coderabbitai generate interesting stats about this repository and render them as a table.`
	- `@coderabbitai show all the console.log statements in this repository.`
	- `@coderabbitai read src/utils.ts and generate unit testing code.`
	- `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.`

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

### CodeRabbit Commands (invoked as PR comments)

- `@coderabbitai pause` to pause the reviews on a PR.
- `@coderabbitai resume` to resume the paused reviews.
- `@coderabbitai review` to trigger a review. This is useful when automatic reviews are disabled for the repository.
- `@coderabbitai resolve` resolve all the CodeRabbit review comments.
- `@coderabbitai help` to get help.


Additionally, you can add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed.

### CodeRabbit Configration File (`.coderabbit.yaml`)

- You can programmatically configure CodeRabbit by adding a `.coderabbit.yaml` file to the root of your repository.
- Please see the [configuration documentation](https://docs.coderabbit.ai/guides/configure-coderabbit) for more information.
- If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: `# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json`

### Documentation and Community

- Visit our [Documentation](https://coderabbit.ai/docs) for detailed information on how to use CodeRabbit.
- Join our [Discord Community](https://discord.com/invite/GsXnASn26c) to get help, request features, and share feedback.
- Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements.

</details>

<!-- tips_end -->

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 5

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between b1aac62 and 8610e02.
Files ignored due to path filters (2)
  • package.json is excluded by !**/*.json
  • pnpm-lock.yaml is excluded by !pnpm-lock.yaml, !**/*.yaml
Files selected for processing (5)
  • .github/_quarto.yml (1 hunks)
  • .github/labeler.yml (1 hunks)
  • .github/workflows/quarto-publish.yml (1 hunks)
  • README.md (2 hunks)
  • README.template.md (1 hunks)
Files skipped from review due to trivial changes (3)
  • .github/_quarto.yml
  • .github/labeler.yml
  • .github/workflows/quarto-publish.yml
Additional Context Used
LanguageTool (35)
README.md (30)

Near line 17: Unpaired symbol: ‘]’ seems to be missing
Context: ... and encourage collaboration - Increase security - Follow accepted [...


Near line 18: Unpaired symbol: ‘]’ seems to be missing
Context: ...security - Follow accepted ethics ## How this template h...


Near line 25: Unpaired symbol: ‘]’ seems to be missing
Context: .../)) - Automatic long-term archiving via Zenodo - Licensed ...


Near line 26: Unpaired symbol: ‘]’ seems to be missing
Context: ...](LICENSE-CCBY.md) license according to [The Turing Way](https://the-turing-way.n...


Near line 32: Unpaired symbol: ‘]’ seems to be missing
Context: ...HANGELOG.md](CHANGELOG.md) according to [keepachangelog.com](https://keepachangel...


Near line 34: Unpaired symbol: ‘]’ seems to be missing
Context: ...iff) - package.json via [npm docs](https://docs.npmjs.com/cli/v7/...


Near line 35: Unpaired symbol: ‘]’ seems to be missing
Context: ...publishing-source-for-github-pages) and Quarto ### Consis...


Near line 39: Unpaired symbol: ‘]’ seems to be missing
Context: ...onsistency - Consistent formatting via Prettier - Consis...


Near line 40: Unpaired symbol: ‘]’ seems to be missing
Context: ...conventionalcommits.org/en/v1.0.0/) via [husky](https://github.com/typicode/husky...


Near line 41: Unpaired symbol: ‘]’ seems to be missing
Context: ...code/husky) - Consistent versioning via [Semantic Versioning](https://semver.org/...


Near line 42: Unpaired symbol: ‘]’ seems to be missing
Context: ...r324/ce0505fbed06b947d962) workflow via [GitHub branch protection](https://docs.g...


Near line 43: Unpaired symbol: ‘]’ seems to be missing
Context: ...rotection-rule) - Consistent issues via [issue templates](https://docs.github.com...


Near line 44: Unpaired symbol: ‘]’ seems to be missing
Context: ...y) - Consistent pull request labels via [labeler](https://github.com/actions/labe...


Near line 49: Unpaired symbol: ‘]’ seems to be missing
Context: ...urity - SECURITY.md per [GitHub](https://docs.github.com/en/code-...


Near line 49: Possible typo: you repeated a word
Context: ...rity - SECURITY.md per GitHub - [GitHub Security Alerts](https://github.blog/20...


Near line 55: Unpaired symbol: ‘]’ seems to be missing
Context: ...CONDUCT.md](CODE_OF_CONDUCT.md) per the [Contributor Covenant](https://www.contri...


Near line 56: Unpaired symbol: ‘]’ seems to be missing
Context: ...g/) - Friendly initial interactions via [Greetings](https://github.com/actions/st...


Near line 71: Unpaired symbol: ‘]’ seems to be missing
Context: ...emplate for your project: - [ ] enable [GitHub security alerts](https://github.b...


Near line 73: Unpaired symbol: ‘]’ seems to be missing
Context: ...EADME.template.md](README.template.md), SECURITY.md - [ ] setup th...


Near line 74: Unpaired symbol: ‘]’ seems to be missing
Context: ...CURITY.md](SECURITY.md) - [ ] setup the [Zenodo integration](https://docs.github....


Near line 75: Unpaired symbol: ‘]’ seems to be missing
Context: ...g-content) - [ ] add ZENODO_RECORD to README.md - [ ] add favicons...


Near line 76: Unpaired symbol: ‘]’ seems to be missing
Context: ...d) - [ ] add favicons to ./, e.g. via favicon.io - [ ] s...


Near line 78: Unpaired symbol: ‘]’ seems to be missing
Context: ... documentation) and fix it - [ ] delete README.md - [ ] rename [READ...


Near line 79: Unpaired symbol: ‘]’ seems to be missing
Context: ...DME.template.md](README.template.md) to README.md - [ ] run `npm run...


Near line 82: Unpaired symbol: ‘]’ seems to be missing
Context: ...un changelog` and include the output in CHANGELOG.md - [ ] enable...


Near line 83: Unpaired symbol: ‘]’ seems to be missing
Context: ...HANGELOG.md](CHANGELOG.md) - [ ] enable [gh-pages](https://help.github.com/en/art...


Near line 84: Unpaired symbol: ‘]’ seems to be missing
Context: ... - [ ] customize the documentation with [Quarto](https://quarto.org/docs/websites...


Near line 88: Unpaired symbol: ‘]’ seems to be missing
Context: ...- [ ] add a CITATION.CFF according to [citation-file-format.github.io](https://...


Near line 89: Unpaired symbol: ‘]’ seems to be missing
Context: ...- [ ] add a .zenodo.json according to [zenodo.org](https://developers.zenodo.or...


Near line 140: Unpaired symbol: ‘]’ seems to be missing
Context: ...s - Moritz Mähr - Initial work - maehr See al...

README.template.md (5)

Near line 16: Loose punctuation mark.
Context: ... is organized as follows: - analysis/: scripts and notebooks used to analyze t...


Near line 22: Loose punctuation mark.
Context: ...ing notes, project plans, etc.) - src/: source code for the data (e.g., scripts...


Near line 30: Three successive sentences begin with the same word. Consider rewording the sentence or use a thesaurus to find a synonym.
Context: ...the data and is part of the products. - TODO All rights and intellectual property is...


Near line 34: This verb does not appear to agree with the subject. Consider using a different form.
Context: ...ns, GNU, BSD, MPL). ## Use These data are openly available to everyone and can be...


Near line 79: Unpaired symbol: ‘]’ seems to be missing
Context: ...ment - FULLNAME - Initial work - USERNAME ...

README.template.md Show resolved Hide resolved
README.template.md Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between 8610e02 and 9566dcf.
Files selected for processing (1)
  • .github/labeler.yml (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • .github/labeler.yml

@maehr maehr requested review from koilebeit and mtwente May 6, 2024 08:45
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits Files that changed from the base of the PR and between 9566dcf and 7fb00b8.
Files ignored due to path filters (1)
  • pnpm-lock.yaml is excluded by !pnpm-lock.yaml, !**/*.yaml
Files selected for processing (2)
  • .github/workflows/quarto-publish.yml (1 hunks)
  • README.md (3 hunks)
Files skipped from review as they are similar to previous changes (1)
  • .github/workflows/quarto-publish.yml
Additional Context Used
LanguageTool (29)
README.md (29)

Near line 18: Unpaired symbol: ‘]’ seems to be missing
Context: ... and encourage collaboration - Increase security - Follow accepted [...


Near line 19: Unpaired symbol: ‘]’ seems to be missing
Context: ...security - Follow accepted ethics ## How this template h...


Near line 26: Unpaired symbol: ‘]’ seems to be missing
Context: .../)) - Automatic long-term archiving via Zenodo - Licensed ...


Near line 27: Unpaired symbol: ‘]’ seems to be missing
Context: ...](LICENSE-CCBY.md) license according to [The Turing Way](https://the-turing-way.n...


Near line 33: Unpaired symbol: ‘]’ seems to be missing
Context: ...HANGELOG.md](CHANGELOG.md) according to [keepachangelog.com](https://keepachangel...


Near line 35: Unpaired symbol: ‘]’ seems to be missing
Context: ...iff) - package.json via [npm docs](https://docs.npmjs.com/cli/v7/...


Near line 36: Unpaired symbol: ‘]’ seems to be missing
Context: ...publishing-source-for-github-pages) and Quarto ### Consis...


Near line 40: Unpaired symbol: ‘]’ seems to be missing
Context: ...onsistency - Consistent formatting via Prettier - Consis...


Near line 41: Unpaired symbol: ‘]’ seems to be missing
Context: ...conventionalcommits.org/en/v1.0.0/) via [husky](https://github.com/typicode/husky...


Near line 42: Unpaired symbol: ‘]’ seems to be missing
Context: ...code/husky) - Consistent versioning via [Semantic Versioning](https://semver.org/...


Near line 43: Unpaired symbol: ‘]’ seems to be missing
Context: ...r324/ce0505fbed06b947d962) workflow via [GitHub branch protection](https://docs.g...


Near line 44: Unpaired symbol: ‘]’ seems to be missing
Context: ...rotection-rule) - Consistent issues via [issue templates](https://docs.github.com...


Near line 49: Unpaired symbol: ‘]’ seems to be missing
Context: ...urity - SECURITY.md per [GitHub](https://docs.github.com/en/code-...


Near line 49: Possible typo: you repeated a word
Context: ...rity - SECURITY.md per GitHub - [GitHub Security Alerts](https://github.blog/20...


Near line 55: Unpaired symbol: ‘]’ seems to be missing
Context: ...CONDUCT.md](CODE_OF_CONDUCT.md) per the [Contributor Covenant](https://www.contri...


Near line 56: Unpaired symbol: ‘]’ seems to be missing
Context: ...g/) - Friendly initial interactions via [Greetings](https://github.com/actions/st...


Near line 71: Unpaired symbol: ‘]’ seems to be missing
Context: ...emplate for your project: - [ ] enable [GitHub security alerts](https://github.b...


Near line 73: Unpaired symbol: ‘]’ seems to be missing
Context: ...EADME.template.md](README.template.md), SECURITY.md - [ ] setup th...


Near line 74: Unpaired symbol: ‘]’ seems to be missing
Context: ...CURITY.md](SECURITY.md) - [ ] setup the [Zenodo integration](https://docs.github....


Near line 75: Unpaired symbol: ‘]’ seems to be missing
Context: ...g-content) - [ ] add ZENODO_RECORD to README.md - [ ] add favicons...


Near line 76: Unpaired symbol: ‘]’ seems to be missing
Context: ...d) - [ ] add favicons to ./, e.g. via favicon.io - [ ] s...


Near line 78: Unpaired symbol: ‘]’ seems to be missing
Context: ... documentation) and fix it - [ ] delete README.md - [ ] rename [READ...


Near line 79: Unpaired symbol: ‘]’ seems to be missing
Context: ...DME.template.md](README.template.md) to README.md - [ ] run `npm run...


Near line 82: Unpaired symbol: ‘]’ seems to be missing
Context: ...un changelog` and include the output in CHANGELOG.md - [ ] enable...


Near line 83: Unpaired symbol: ‘]’ seems to be missing
Context: ...HANGELOG.md](CHANGELOG.md) - [ ] enable [gh-pages](https://help.github.com/en/art...


Near line 84: Unpaired symbol: ‘]’ seems to be missing
Context: ... - [ ] customize the documentation with [Quarto](https://quarto.org/docs/websites...


Near line 88: Unpaired symbol: ‘]’ seems to be missing
Context: ...- [ ] add a CITATION.CFF according to [citation-file-format.github.io](https://...


Near line 89: Unpaired symbol: ‘]’ seems to be missing
Context: ...- [ ] add a .zenodo.json according to [zenodo.org](https://developers.zenodo.or...


Near line 140: Unpaired symbol: ‘]’ seems to be missing
Context: ...s - Moritz Mähr - Initial work - maehr See al...

Additional comments not posted (2)
README.md (2)

8-9: The updates to the license badges are aligned with the new licensing structure. Ensure that the placeholders USERNAME and REPO_NAME are replaced with actual values.


11-11: Ensure the placeholder ZENODO_RECORD in the DOI badge is replaced with an actual DOI record.

@maehr maehr requested a review from mtwente May 6, 2024 21:42
@maehr maehr requested a review from mtwente May 6, 2024 21:51
@maehr maehr merged commit 1229e3c into main May 6, 2024
2 of 3 checks passed
@maehr maehr deleted the various_fixes branch May 6, 2024 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants