Merge branch 'v2-beta' of https://github.com/nhubbard/MagicMirror into v2-beta

This commit is contained in:
Nicholas Hubbard 2016-05-03 19:56:28 -04:00
commit 4117938140
No known key found for this signature in database
GPG Key ID: 732AF7DD9E9C91F5

View File

@ -122,3 +122,4 @@ Please keep the following in mind:
- **New Features**: please please discuss in a GitHub issue before you start to alter a big part of the code. Without discussion upfront, the pull request will not be accepted / merged. - **New Features**: please please discuss in a GitHub issue before you start to alter a big part of the code. Without discussion upfront, the pull request will not be accepted / merged.
Thanks for your help in making MagicMirror² better! Thanks for your help in making MagicMirror² better!