Merge pull request #30 from opendesktop/develop (57105a0e) · 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.

57105a0e

Unverified Commit 57105a0e authored 7 years ago by akiraohgaki Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #30 from opendesktop/develop

Develop

parents 6d7246a2 2d69fcd3

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/src/handlers/confighandler.cpp 6 additions, 6 deletions

app/src/handlers/confighandler.cpp
app/src/handlers/confighandler.h 2 additions, 2 deletions

app/src/handlers/confighandler.h
app/src/handlers/itemhandler.cpp 21 additions, 21 deletions

app/src/handlers/itemhandler.cpp
app/src/handlers/itemhandler.h 4 additions, 4 deletions

app/src/handlers/itemhandler.h
app/src/handlers/ocsapihandler.cpp 4 additions, 4 deletions

app/src/handlers/ocsapihandler.cpp
app/src/handlers/systemhandler.cpp 1 addition, 1 deletion

app/src/handlers/systemhandler.cpp
app/src/handlers/updatehandler.cpp 1 addition, 1 deletion

app/src/handlers/updatehandler.cpp
app/src/websockets/websocketserver.cpp 3 additions, 3 deletions

app/src/websockets/websocketserver.cpp
scripts/prepare 1 addition, 1 deletion

scripts/prepare

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