Merge pull request #59 from opendesktop/develop (b14c7b9c) · Commits · kimblejeremy / ocs-url · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ocs-url
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- 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.

b14c7b9c

Commit b14c7b9c authored 7 years ago by akiraohgaki Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #59 from opendesktop/develop

Develop

parents bfffe989 53ffa286

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/app.pri 2 additions, 0 deletions

app/app.pri
app/configs/install_types.json 5 additions, 5 deletions

app/configs/install_types.json
app/src/handlers/confighandler.cpp 49 additions, 27 deletions

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

app/src/handlers/confighandler.h
app/src/handlers/ocsurlhandler.cpp 7 additions, 7 deletions

app/src/handlers/ocsurlhandler.cpp
app/src/handlers/ocsurlhandler.h 3 additions, 3 deletions

app/src/handlers/ocsurlhandler.h
app/src/main.cpp 5 additions, 5 deletions

app/src/main.cpp
ocs-url.pro 0 additions, 2 deletions

ocs-url.pro
scripts/import.sh 1 addition, 1 deletion

scripts/import.sh

with 78 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