Merge pull request #29 from opendesktop/develop (6d7246a2) · Commits · DFN2 / ocs-manager · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

ocs-manager
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Repositories are limited in size now to 1GB. If your repository exceeds this size, it will be automatically deleted.

Admin message

If you'd like access to our CI/CD builders, please create an issue here.

6d7246a2

Unverified Commit 6d7246a2 authored 7 years ago by akiraohgaki Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #29 from opendesktop/develop

Develop

parents d68d8c06 dd371586

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/configs/application.json 1 addition, 1 deletion

app/configs/application.json
app/src/handlers/itemhandler.cpp 1 addition, 2 deletions

app/src/handlers/itemhandler.cpp
app/src/websockets/websocketserver.cpp 31 additions, 31 deletions

app/src/websockets/websocketserver.cpp
app/src/websockets/websocketserver.h 15 additions, 15 deletions

app/src/websockets/websocketserver.h
pkg/appimage/appimagebuild 3 additions, 2 deletions

pkg/appimage/appimagebuild
scripts/package 2 additions, 2 deletions

scripts/package
scripts/prepare 1 addition, 1 deletion

scripts/prepare

with 54 additions and 54 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