Merge branch 'development' into 'master' (3b9a3ab3) · Commits · violethaze74 / pling-store-development · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

pling-store-development
- Activity
- Members
- Labels
- 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.

3b9a3ab3

Commit 3b9a3ab3 authored 5 years ago by azubieta

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request dfn2/pling-store!17

parents a10f5008 3f1d851a

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
app/main.js 3 additions, 1 deletion

app/main.js
app/scripts/components/ToolbarComponent.js 1 addition, 1 deletion

app/scripts/components/ToolbarComponent.js
package-lock.json 139 additions, 5 deletions

package-lock.json
package.json 5 additions, 12 deletions

package.json
pkg/appimage/appimagebuild 16 additions, 8 deletions

pkg/appimage/appimagebuild

with 165 additions and 28 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