Merge branch 'master' of github.com:standardnotes/electron

standardnotes · Jan 15, 2017 · ca7ca2a · ca7ca2a
2 parents 1ce53c2 + 3dff71d
commit ca7ca2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/LICENSE b/LICENSE
@@ -1 +1 @@
-MIT
+Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
diff --git a/README.md b/README.md
@@ -2,3 +2,7 @@ Build for all platforms:
 ```
 electron-packager . "Standard Notes" --platform=all --icon=icon/icon --overwrite --osx-sign='Mac Developer ID Application: xxx' --out=dist
 ```
+
+## License
+
+Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		MIT
		Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html