Skip to content

Commit beea806

Browse files
committed
chore: merge with upstream/master
2 parents f19e6ee + 7d5eeb3 commit beea806

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
### Changelog
22
All notable changes to this project will be documented in this file.
33

4+
#### [Unreleased](https://github.com/maximegris/angular-electron/compare/3.3.0...3.4.0)
5+
- Resolved Translation issue [`#186`](https://github.com/maximegris/angular-electron/pull/186)
6+
- Removed unused file [`#185`](https://github.com/maximegris/angular-electron/pull/185)
7+
- ref/ remove contributors [`6dc97a1`](https://github.com/maximegris/angular-electron/commit/6dc97a1ea857b48a7a111768f58498c91a3572b5)
8+
- Translation issue [`35354b1`](https://github.com/maximegris/angular-electron/commit/35354b1025d98fd14d0566d3aa3112bb9c36fc91)
9+
- version 3.4.0 [`06d6b0f`](https://github.com/maximegris/angular-electron/commit/06d6b0f8c5de703a9c7f5dcfc880a9673aa6eec8)
10+
411
#### [3.3.0](https://github.com/maximegris/angular-electron/compare/3.2.0...3.3.0)
512
- add Changelog file [`71083f1`](https://github.com/maximegris/angular-electron/commit/71083f12bf1e20225769af20a8a054ab8af4a6f9)
613
- version 3.3.0 [`a88bda6`](https://github.com/maximegris/angular-electron/commit/a88bda66d83690b1064bcb11a0cb1bb893894caf)

README.md

-6
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@ You can desactivate "Developer Tools" by commenting `win.webContents.openDevTool
8585
Maybe you want to execute the application in the browser (WITHOUT HOT RELOAD ACTUALLY...) ? You can do it with `npm run ng:serve`.
8686
Note that you can't use Electron or NodeJS native libraries in this case. Please check `providers/electron.service.ts` to watch how conditional import of electron/Native libraries is done.
8787

88-
## Contributors
89-
90-
[<img alt="Maxime GRIS" src="https://avatars2.githubusercontent.com/u/10827551?v=3&s=117" width="117">](https://github.com/maximegris) |
91-
:---:
92-
|[Maxime GRIS](https://github.com/maximegris)|
93-
9488
[build-badge]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master
9589
[build]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master
9690
[dependencyci-badge]: https://dependencyci.com/github/maximegris/angular-electron/badge

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-electron",
3-
"version": "3.3.0",
3+
"version": "3.4.0",
44
"description": "Angular 5 with Electron (Typescript + SASS + Hot Reload)",
55
"homepage": "https://github.com/maximegris/angular-electron",
66
"author": {

0 commit comments

Comments
 (0)