Merge pull request #304 from atom-community/upstream_master

Author: aminya

.gitignore

@@ -16,5 +16,6 @@ node_modules
 docs/output
 docs/includes
 spec/fixtures/evil-files/
+!spec/fixtures/packages/package-with-incompatible-native-module-loaded-conditionally/node_modules/
 out/
 /electron/

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2020 GitHub Inc.
+Copyright (c) 2011-2021 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -76,9 +76,10 @@ repeat these steps to upgrade to future releases.
 
 ## Discussion
 
-* Discuss Atom on our [forums](https://discuss.atom.io/)
+* Discuss Atom on our [forums](https://discuss.atom.io/) or on [GitHub Discussions](https://github.com/atom/atom/discussions)
 * Chat about Atom on our Slack team -- [instructions for joining](https://discuss.atom.io/t/join-us-on-slack/16638?source_topic_id=25406)
 
+
 ## License
 
 [MIT](https://github.com/atom/atom/blob/master/LICENSE.md)