Merge branch 'master' into greenkeeper/@types/event-stream-3.3.32 (419e9fc9) · Commits · Essem / Sharkey · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Sharkey
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

419e9fc9

Commit 419e9fc9 authored 7 years ago by こぴなたみぽ Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge branch 'master' into greenkeeper/@types/event-stream-3.3.32

parents a5cdce9e b32ec6f3

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 1 deletion

.travis.yml
appveyor.yml 1 addition, 1 deletion

appveyor.yml
package.json 13 additions, 13 deletions

package.json
src/api/models/access-token.ts 2 additions, 2 deletions

src/api/models/access-token.ts
src/api/models/app.ts 3 additions, 3 deletions

src/api/models/app.ts
src/api/models/drive-file.ts 1 addition, 1 deletion

src/api/models/drive-file.ts
src/api/models/user.ts 2 additions, 2 deletions

src/api/models/user.ts
test/api.js 0 additions, 2 deletions

test/api.js

with 23 additions and 25 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