Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

d709e4ae

Commit d709e4ae authored 6 years ago by akiraohgaki

Downloads
- Plain Diff

Merge branch 'develop'

parents 453989e6 65f0d7ab

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/images/images.css 4 additions, 0 deletions

app/images/images.css
app/images/material-design-icons/ic_refresh_48px.svg 1 addition, 0 deletions

app/images/material-design-icons/ic_refresh_48px.svg
app/scripts/components/ToolBar.js 6 additions, 1 deletion

app/scripts/components/ToolBar.js
app/scripts/renderers/ipc-renderer.js 26 additions, 20 deletions

app/scripts/renderers/ipc-renderer.js
app/scripts/renderers/window-renderer.js 8 additions, 0 deletions

app/scripts/renderers/window-renderer.js
launcher/ocs-store 3 additions, 0 deletions

launcher/ocs-store
package-lock.json 1 addition, 1 deletion

package-lock.json
package.json 1 addition, 1 deletion

package.json
pkg/appimage/appimagebuild 1 addition, 1 deletion

pkg/appimage/appimagebuild

with 51 additions and 24 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