Skip to content

Commit

Permalink
Merge branch 'feature/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
phobal committed May 5, 2018
2 parents 4845e60 + a48bac9 commit 8002bfc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "electron-react-boilerplate",
"productName": "electron-react-boilerplate",
"version": "1.0.0",
"version": "1.1.0",
"description": "Electron application boilerplate based on React, React Router, Webpack, React Hot Loader for rapid application development",
"main": "./main.prod.js",
"author": {
Expand Down

0 comments on commit 8002bfc

Please sign in to comment.