Skip to content
This repository was archived by the owner on Jan 11, 2024. It is now read-only.

merge Master into develop #11

Merged
merged 13 commits into from
Mar 20, 2017
Merged

merge Master into develop #11

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
53fa2c4
Merge pull request #2 from briebugconsulting/develop
jessesanders Jan 10, 2017
4578b1d
Merge branch 'develop'
jessesanders Jan 13, 2017
1ed4f04
Merge pull request #5 from briebugconsulting/develop
jessesanders Jan 27, 2017
74824ba
feat(build): add npmrc for npm publish to have credentials
jessesanders Jan 27, 2017
132e7a1
feat(build): add npmrc for npm publish to have credentials
jessesanders Jan 27, 2017
1398277
feat(build): change login to npm method to use echo and pipe then pub…
jessesanders Jan 27, 2017
000c5f4
feat(build): change login to npm method to use echo and pipe then pub…
jessesanders Jan 27, 2017
52741af
feat(publish): add publish dep to handle pushing code up
jessesanders Jan 27, 2017
b76266d
feat(grid-download): download button with event
amitskevich Feb 1, 2017
4193653
Merge pull request #6 from briebugconsulting/grid-download
jessesanders Feb 1, 2017
8df50c3
build(version): update version to 2.1.5
jessesanders Feb 2, 2017
d9550de
Merge pull request #8 from briebugconsulting/develop
jessesanders Feb 23, 2017
eab579d
Merge pull request #10 from briebugconsulting/develop
jessesanders Feb 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge pull request #10 from briebugconsulting/develop 
feat(versioning): add versioning guideline doc
  • Loading branch information
@jessesanders
jessesanders authored Feb 23, 2017
commit eab579dd2c17b93bd4d5f0a134dc718a306b9cd5

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.