Merge branch 'master' into develop (c6f5b077) · Commits · DFN2 / ocs-url · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ocs-url
- 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.

c6f5b077

Commit c6f5b077 authored 7 years ago by akiraohgaki

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 3c122839 bfffe989

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/qml/main.qml 2 additions, 2 deletions

app/qml/main.qml
i18n/messages.en_US.qm 0 additions, 0 deletions

i18n/messages.en_US.qm
i18n/messages.en_US.ts 4 additions, 4 deletions

i18n/messages.en_US.ts
i18n/messages.ja_JP.qm 0 additions, 0 deletions

i18n/messages.ja_JP.qm
i18n/messages.ja_JP.ts 2 additions, 2 deletions

i18n/messages.ja_JP.ts
i18n/messages.tr_TR.qm 0 additions, 0 deletions

i18n/messages.tr_TR.qm
i18n/messages.tr_TR.ts 2 additions, 2 deletions

i18n/messages.tr_TR.ts
i18n/messages.ts 2 additions, 2 deletions

i18n/messages.ts
pkg/fedora/ocs-url.spec 1 addition, 1 deletion

pkg/fedora/ocs-url.spec
pkg/opensuse/ocs-url.spec 1 addition, 1 deletion

pkg/opensuse/ocs-url.spec
pkg/ubuntu/debian/changelog 1 addition, 1 deletion

pkg/ubuntu/debian/changelog

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