Removed Commons Clause (#177)

CONTRIBUTING.md

@@ -1,3 +1,5 @@
+==== CONTRIBUTION GUIDELINES ====
+
 Hello!
 
 If you're reading this, you probably want to contribute to Mlem. Welcome! We're happy to have you on board.
@@ -15,3 +17,9 @@ In addition, please develop according to the following principles:
 - All View-specific functions should live in an extension to that view, located in the same directory as the view. This file should be named "<View Name> Logic" (e.g., "Large Post View Logic")
 - Within reason, any complex of views that renders a single component of a larger view should be placed in a descriptively named let, func, or @ViewBuilder var beneath the body of the View. This keeps pyramids from piling up and makes our accessibility expert's work easier.
 - If you can reuse code, do. Prefer abstracting common components to a generic struct and common logic to a generic function.
+
+==== MERGE PROTOCOL ====
+
+We follow the principle that devs should merge their own code. This ensures that nothing enters the codebase without it being completely ready in both the eyes of the reviewers and the developer, thereby cutting down on bad code in master and tack-on PRs.
+
+When your code is approved, if you have permission to do so, you are responsible for clicking that beautiful "squash and merge." If you need to tinker with it post-approval, please make a comment that you are doing so. PRs that sit approved for more than 12 hours with no input from the dev may be merged if they are blocking other work.

LICENSE

@@ -675,22 +675,6 @@ Public License instead of this License.  But first, please read
 
 ----
 
-“Commons Clause” License Condition v1.0
-
-The Software is provided to you by the Licensor under the License, as defined below, subject to the following condition.
-
-Without limiting other conditions in the License, the grant of rights under the License will not include, and the License does not grant to you, the right to Sell the Software.
-
-For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/ support services related to the Software), a product or service whose value derives, entirely or substantially, from the functionality of the Software. Any license notice or attribution required by the License must also include this Commons Clause License Condition notice.
-
-Software: Mlem
-
-License: GPL 3.0
-
-Licensor: The Mlem Group
-
-----
-
 The Mlem iOS developers are aware that the terms of service that apply to apps distributed via Apple's App Store services may conflict with rights granted under
-the Mlem iOS license, the "GNU GPLv3 amended by the Commons Clause v1". We have committed not to pursue any license violation that results solely from the conflict between
-the "GNU GPLv3 amended by the Commons Clause v1" or any later version and the Apple App Store terms of service.
+the Mlem iOS license, the "GNU GPLv3". We have committed not to pursue any license violation that results solely from the conflict between
+the "GNU GPLv3" or any later version and the Apple App Store terms of service.

README.md

@@ -76,6 +76,4 @@ In order to benefit please ensure you have [Homebrew](https://brew.sh) installed
 
 ## License
 
-Mlem is licensed under [Commons Clause](https://commonsclause.com).
-
-This means that Mlem is open-source and you can do whatever you want with its source, like modifying it, contributing to it etc., but you can't sell Mlem or modified versions of it.
+Mlem is fully open-source, licensed under GPL 3.0 with an addendum for compliance with the Apple App Store. See LICENSE for details.