Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

W

waterdataui
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

4ef79da7

Commit 4ef79da7 authored 7 years ago by Bucknell, Mary S.

Downloads
- Plain Diff

Merge branch 'master' of github.com:usgs/waterdataui into wdfn-76

# Conflicts:
#	assets/src/scripts/components/hydrograph/index.js

parents 889c0f2c 158c199f

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.bumpversion.cfg 2 additions, 0 deletions

.bumpversion.cfg
assets/src/scripts/components/hydrograph/index.js 24 additions, 17 deletions

assets/src/scripts/components/hydrograph/index.js
assets/src/scripts/components/hydrograph/index.spec.js 12 additions, 3 deletions

assets/src/scripts/components/hydrograph/index.spec.js
assets/src/scripts/components/hydrograph/store.js 13 additions, 2 deletions

assets/src/scripts/components/hydrograph/store.js
assets/src/scripts/components/hydrograph/store.spec.js 33 additions, 1 deletion

assets/src/scripts/components/hydrograph/store.spec.js
assets/src/styles/components/_hydrograph.scss 1 addition, 0 deletions

assets/src/styles/components/_hydrograph.scss
package-lock.json 1 addition, 1 deletion

package-lock.json

with 86 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment