Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

Drip
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

cd3cc3c7

Commit cd3cc3c7 authored 6 years ago by tina

Downloads
- Plain Diff

Merge branch 'master' into '28-edit-temperature-screen'

# Conflicts:
#   home.js

parents f2ad9f10 73c5785f

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
home.js 13 additions, 0 deletions

home.js
package-lock.json 1561 additions, 1561 deletions

package-lock.json

with 1575 additions and 1562 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