Merge master into 100⭐️

2017-01-03 11:57:50 +02:00 · 2017-01-03 11:57:50 +02:00 · f4d1bc65db
parent e5cd2fd649 b3528c9aff
commit f4d1bc65db
2 changed files with 13 additions and 1 deletions
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1,6 @@
-v5
+<<<<<<< HEAD
+v5
+||||||| merged common ancestors
+=======
+v4
+>>>>>>> master
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@ -0,0 +1,7 @@
+Hi there, please provide some info about your enviornment before submiting this issue:
+- device        :
+- OS            :
+- email client  :
+- node version  :
+- npm version   :
+- error message :