Docs: Gitter -> Discord

CONTRIBUTING.md

@@ -3,27 +3,21 @@
 
 ## Workflow
 
-If want to add a feature but are not sure how to do this or how it should behave in edge cases, feel free to chat us up in gitter. 
+If you want to add a feature but are not sure how to do this or how it should behave in edge cases, feel free to chat us up in [Discord](https://discord.gg/JTrUxhq7sj). 
 
-When making PRs:
-
-* Use `develop` as the base branch, not `master`
-
-* Please allow Airstream maintainers to make changes to your branch. We might make changes, so make a copy of your branch if you need to.
-
-Note: we will likely squash your commits when merging into `develop`.
+When making PRs, please allow Airstream maintainers to make changes to your branch. We might make changes, so make a copy of your branch if you need it.
 
 
 ## Code style
 
 Please try to match the existing code style, including naming conventions and formatting. I might fix up such things to my liking before merging.
 
-We don't have scalafmt set up at the moment. Previous versions weren't flexible enough for me, but I'll re-evaluate soon.
+We don't have scalafmt set up at the moment. It's just not flexible enough to support my preferred style.
 
 
 ## N-Generators
 
-Airstream offers several types of methods like `combineWith` and `mapN` in varying arities. These live in packages called `generated`, in implicit classes that are generated at compile time by generators located in the `project` folder.
+Airstream offers several types of methods like `combineWith` and `mapN` in varying arity. These live in packages called `generated`, in implicit classes that are generated at compile time by generators located in the `project` folder.
 
 To apply and execute your changes to the generators, run `reload; compile` in sbt. We commit all generated files to git because invisible code is annoying to figure out, and to help with source maps.
 
@@ -32,4 +26,4 @@ To apply and execute your changes to the generators, run `reload; compile` in sb
 
 README.md needs to be updated before the changes can be merged into `master`. I usually do this after the feature is done.
 
-We used to publish itemized changes in CHANGELOG.md but we switched to publishing release blog posts at [laminar.dev](https://laminar.dev).
+We used to publish itemized changes in CHANGELOG.md, but we switched to publishing release blog posts at [laminar.dev](https://laminar.dev).

README.md

@@ -1,7 +1,7 @@
 # Airstream
 
 [![Build Status](https://circleci.com/gh/raquo/Airstream.svg?style=svg)](https://circleci.com/gh/raquo/Airstream)
-[![Join the chat at https://gitter.im/Laminar_/Lobby](https://badges.gitter.im/Laminar_/Lobby.svg)](https://gitter.im/Laminar_/Lobby)
+[![Chat on https://discord.gg/JTrUxhq7sj](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/JTrUxhq7sj)
 ![Maven Central](https://img.shields.io/maven-central/v/com.raquo/airstream_sjs1_2.13.svg)
 
 Airstream is a small state propagation and streaming library for Scala.js. Primary differences from other solutions:
@@ -80,7 +80,7 @@ I created Airstream because I found existing solutions were not suitable for bui
 
 ## Community
 
-* [Gitter](https://gitter.im/Laminar_/Lobby) for chat and random questions (Airstream shares this room with [Laminar](https://laminar.dev))
+* [Discord](https://discord.gg/JTrUxhq7sj) for chat and random questions (Airstream shares this server with [Laminar](https://laminar.dev))
 * [Github issues](https://github.com/raquo/Airstream/issues) for bugs, feature requests, and more in-depth discussions
 
 
@@ -715,7 +715,7 @@ Warning: dom.XmlHttpRequest is an ugly, imperative JS construct. We set event ca
 
 Airstream has no official websockets integration yet.
 
-For several users' implementations, search Laminar gitter room, and the issues in this repo.
+For several users' implementations, search the [Laminar gitter room](https://gitter.im/Laminar_/Lobby), and the issues in this repo.
 
 
 #### DOM Events
@@ -1062,7 +1062,7 @@ Note: These operators are available on qualifying streams and signals by means o
 
 This operator is particularly hard to put into words, at least on my first try. You might want to read the `split signal into signals` test in `SplitEventStreamSpec.scala`
 
-And hey, don't be a stranger, remember we have [Gitter](https://gitter.im/Laminar_/Lobby) for chat.
+And hey, don't be a stranger, remember we have [Discord](https://discord.gg/JTrUxhq7sj) for chat.
 
 ##### Example 1: Latest Version of Foo by Id