Skip to content

Cascade merge of PRs #134 and #135 into master

Marek Szuba requested to merge version/2.5 into master

Created by: ens-bwalts

Requirements

  • Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion;
  • Review the development guidelines for eHive; remember in particular:

Use case

Cascade merge of #134 and #135 into master

Note - as this is a cascade merge, it should be merged into master, not rebased.

Description

See #134 and #135

Possible Drawbacks

Testing

Test-merged locally and no merge conflicts arose.

Merge request reports